133535: resolve merge conflicts

Wout-atmire · Wout-atmire · commit 2d7026891a5f · 2025-09-22T10:38:28.000+02:00
diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
@@ -2,14 +2,14 @@ import { of } from 'rxjs';
 
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { RouterStub } from '../../shared/testing/router.stub';
+import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
 import {
   SortDirection,
   SortOptions,
 } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
-import { PaginationService } from './pagination.service';
 import { ScrollService } from '../scroll/scroll.service';
-import { ScrollServiceStub } from '../../shared/testing/scroll-service.stub';
+import { PaginationService } from './pagination.service';
 
 
 describe('PaginationService', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
@@ -1,11 +1,15 @@
-import { Injectable, InjectionToken } from '@angular/core';
+import {
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
 import {
   NavigationExtras,
   Router,
 } from '@angular/router';
 import {
+  BehaviorSubject,
   combineLatest as observableCombineLatest,
-  Observable, BehaviorSubject,
+  Observable,
 } from 'rxjs';
 import {
   filter,
@@ -26,9 +30,9 @@ import {
   SortOptions,
 } from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { ScrollService } from '../scroll/scroll.service';
 import { RouteService } from '../services/route.service';
 import { PaginationRouteParams } from './pagination-route-params.interface';
-import { ScrollService } from '../scroll/scroll.service';
 
 export const RETAIN_SCROLL_POSITION: InjectionToken<BehaviorSubject<any>> = new InjectionToken<boolean>('retainScrollPosition');
 
diff --git a/src/app/core/scroll/scroll.service.ts b/src/app/core/scroll/scroll.service.ts
@@ -1,5 +1,8 @@
-import { Inject, Injectable } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 
 /**
  * Service used to scroll to a specific fragment/ID on the page
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
@@ -107,7 +107,7 @@ describe('SearchService', () => {
       service.setViewMode(ViewMode.GridElement);
 
       expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith(
-        'page-id',
+        'test-id',
         ['/search'],
         { page: 1 },
         { view: ViewMode.GridElement },
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,3 +1,4 @@
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -34,11 +35,16 @@ import { FindListOptions } from '../../../../../core/data/find-list-options.mode
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
 import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { Context } from '../../../../../core/shared/context.model';
 import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
 import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
@@ -52,16 +58,14 @@ import { ListableObject } from '../../../../object-collection/shared/listable-ob
 import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { SearchResult } from '../../../../search/models/search-result.model';
+import { followLink } from '../../../../utils/follow-link-config.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component';
 import {
   AddRelationshipAction,
   RemoveRelationshipAction,
   UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
 import { ThemedDynamicLookupRelationSearchTabComponent } from './search-tab/themed-dynamic-lookup-relation-search-tab.component';
 import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dynamic-lookup-relation-selection-tab.component';
 
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -2,7 +2,8 @@ import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
-  OnInit, Input,
+  Input,
+  OnInit,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
@@ -11,6 +11,7 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
@@ -19,35 +20,34 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../core/shared/search/search-filter.service';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { RouterStub } from '../testing/router.stub';
 import { SearchFilterServiceStub } from '../testing/search-filter-service.stub';
 import { SearchServiceStub } from '../testing/search-service.stub';
 import { SearchFormComponent } from './search-form.component';
-import { of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
   let fixture: ComponentFixture<SearchFormComponent>;
   let de: DebugElement;
 
-  const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+  const mockSearchOptions = of(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'test-id',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
-    scope: 'MCU'
+    scope: 'MCU',
   }));
 
   const router = new RouterStub();
   const searchService = new SearchServiceStub();
   let searchFilterService: SearchFilterServiceStub;
   const paginationService = new PaginationServiceStub();
-  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions};
+  const searchConfigService = { paginationID: 'test-id', paginatedSearchOptions: mockSearchOptions };
   const firstPage = { 'spc.page': 1 };
   const dspaceObjectService = {
     findById: () => createSuccessfulRemoteDataObject$(undefined),
@@ -127,7 +127,7 @@ describe('SearchFormComponent', () => {
       searchQuery = {};
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, {}, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { 'spc.page': 1 }, false);
     });
 
     it('should navigate to the search first page with parameters only query if only query is provided', () => {
@@ -137,7 +137,8 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { query: 'THOR' }, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {},
+        { 'spc.page': 1, query: 'THOR' }, false);
     });
 
     it('should navigate to the search first page with parameters only query if only scope is provided', () => {
@@ -147,7 +148,8 @@ describe('SearchFormComponent', () => {
 
       comp.updateSearch(searchQuery);
 
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {}, { scope: 'MCU' }, false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith(undefined, {},
+        { 'spc.page': 1, scope: 'MCU' }, false);
     });
   });
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
@@ -3,7 +3,6 @@ import {
   Input,
 } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { AbstractComponentLoaderComponent } from '../../../../abstract-component-loader/abstract-component-loader.component';
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -12,17 +12,22 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
+import { PaginationService } from 'ngx-pagination';
 import {
   BehaviorSubject,
   of,
 } 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';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SearchFilterServiceStub } from '../../../../testing/search-filter-service.stub';
@@ -32,15 +37,6 @@ import { FacetValues } from '../../../models/facet-values.model';
 import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../testing/pagination-service.stub';
-import { PaginationService } from 'ngx-pagination';
-import { RouteService } from '../../../../../core/services/route.service';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -32,6 +32,10 @@ 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 { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -46,7 +50,6 @@ import { currentPath } from '../../../../utils/route.utils';
 import { AppliedFilter } from '../../../models/applied-filter.model';
 import { FacetValue } from '../../../models/facet-value.model';
 import { FacetValues } from '../../../models/facet-values.model';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchOptions } from '../../../models/search-options.model';
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.spec.ts
@@ -28,20 +28,20 @@ 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';
 import { SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
 import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
+import { routeServiceStub } from '../../../../testing/route-service.stub';
 import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SearchServiceStub } from '../../../../testing/search-service.stub';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
-import { routeServiceStub } from '../../../../testing/route-service.stub';
-import { RouteService } from '../../../../../core/services/route.service';
 
 describe('SearchHierarchyFilterComponent', () => {
   let comp: SearchHierarchyFilterComponent;
@@ -156,12 +156,14 @@ describe('SearchHierarchyFilterComponent', () => {
           expect(modalService.open).toHaveBeenCalled();
           tick();
           expect(searchConfigService.selectNewAppliedFilterParams).toHaveBeenCalled();
-          expect(router.navigate).toHaveBeenCalledWith(['/search'], {
-            queryParams: {
+          expect(router.navigate).toHaveBeenCalledWith(['', 'search'], {
+            queryParams: jasmine.objectContaining({
               [`f.${testSearchFilter}`]: [
                 'definedBy_selectNewAppliedFilterParams',
               ],
-            },
+            }),
+            queryParamsHandling: 'merge',
+            fragment: 'prevent-scroll',
           });
         }));
       });
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -35,6 +35,10 @@ 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 { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -52,7 +56,6 @@ import {
 } from '../search-facet-filter/search-facet-filter.component';
 import { SearchFacetOptionComponent } from '../search-facet-filter-options/search-facet-option/search-facet-option.component';
 import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -85,7 +88,7 @@ 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
+              @Inject(RETAIN_SCROLL_POSITION) protected retainScrollPosition: boolean,
   ) {
     super(
       searchService,
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
@@ -18,6 +18,7 @@ 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';
@@ -35,7 +36,6 @@ import { FilterType } from '../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetRangeOptionComponent } from '../search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
 import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RETAIN_SCROLL_POSITION } from '../../../../../core/pagination/pagination.service';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -23,6 +23,10 @@ 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 { RouteService } from '../../../../../core/services/route.service';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
@@ -39,7 +43,6 @@ import {
   RANGE_FILTER_MAX_SUFFIX,
   RANGE_FILTER_MIN_SUFFIX,
 } from './search-range-filter-constants';
-import { RETAIN_SCROLL_POSITION, PaginationService } from '../../../../../core/pagination/pagination.service';
 
 /**
  * This component renders a simple item page.
@@ -181,7 +184,7 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     const newMax = this.range[1] !== this.max ? [this.range[1]] : null;
     this.paginationService.updateRouteWithUrl(this.searchConfigService.paginationID, this.getSearchLinkParts(), {}, {
       [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
-      [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
+      [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax,
     }, this.retainScrollPosition);
     this.filter = '';
   }
