From 23fe338c5d68fc15e3e2f3abfb6af0ec825f1a69 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 8 Apr 2021 16:18:31 +0200
Subject: [PATCH] [CST-4009] fix sort options on pagination change

---
 .../+my-dspace-page/my-dspace-page.component.ts | 17 +++++++----------
 src/app/+search-page/search.component.ts        |  2 +-
 .../search/search-configuration.service.ts      | 13 +++++--------
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/app/+my-dspace-page/my-dspace-page.component.ts b/src/app/+my-dspace-page/my-dspace-page.component.ts
index de51d9afd3..b95a296ed1 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -7,8 +7,8 @@ import {
   OnInit
 } from '@angular/core';
 
-import { BehaviorSubject, combineLatest, Observable, Subject, Subscription } from 'rxjs';
-import { map, switchMap, take, tap } from 'rxjs/operators';
+import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
+import { map, switchMap, tap } from 'rxjs/operators';
 
 import { PaginatedList } from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
@@ -19,7 +19,7 @@ import { PaginatedSearchOptions } from '../shared/search/paginated-search-option
 import { SearchService } from '../core/shared/search/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue } from '../shared/empty.util';
-import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../core/shared/operators';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
 import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
@@ -29,10 +29,8 @@ import { ViewMode } from '../core/shared/view-mode.model';
 import { MyDSpaceRequest } from '../core/data/request.models';
 import { SearchResult } from '../shared/search/search-result.model';
 import { Context } from '../core/shared/context.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { SearchConfig } from '../core/shared/search/search-filters/search-config.model';
-import {RouteService} from '../core/services/route.service';
-import {Router} from '@angular/router';
+import { SortOptions } from '../core/cache/models/sort-options.model';
+import { RouteService } from '../core/services/route.service';
 
 export const MYDSPACE_ROUTE = '/mydspace';
 export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
@@ -119,8 +117,7 @@ export class MyDSpacePageComponent implements OnInit {
               private sidebarService: SidebarService,
               private windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService,
-              private routeService: RouteService,
-              private router: Router) {
+              private routeService: RouteService) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.service.setServiceOptions(MyDSpaceResponseParsingService, MyDSpaceRequest);
   }
@@ -166,7 +163,7 @@ export class MyDSpacePageComponent implements OnInit {
 
     this.sortOptions$ = this.searchConfigService.getConfigurationSortOptionsObservable(configuration$, this.service);
 
-    this.searchConfigService.initializeSortOptionsFromConfiguration(this.sortOptions$, this.router);
+    this.searchConfigService.initializeSortOptionsFromConfiguration(this.sortOptions$);
 
   }
 
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index c5813a2fd1..bffa958ee5 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -141,7 +141,7 @@ export class SearchComponent implements OnInit {
 
     this.sortOptions$ = this.searchConfigService.getConfigurationSortOptionsObservable(this.configuration$, this.service);
 
-    this.searchConfigService.initializeSortOptionsFromConfiguration(this.sortOptions$, this.router);
+    this.searchConfigService.initializeSortOptionsFromConfiguration(this.sortOptions$);
 
   }
 
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index 339eefdc6b..e10ab668cc 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, OnDestroy } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Params, Router } from '@angular/router';
+import { ActivatedRoute, Params } from '@angular/router';
 
 import {
   BehaviorSubject,
@@ -230,20 +230,17 @@ export class SearchConfigurationService implements OnDestroy {
    * @param configuration$
    * @param service
    */
-  initializeSortOptionsFromConfiguration(sortOptions$: Observable<SortOptions[]>, router: Router) {
+  initializeSortOptionsFromConfiguration(sortOptions$: Observable<SortOptions[]>) {
     const subscription = sortOptions$.pipe(switchMap((sortOptions) => combineLatest([
       of(sortOptions),
       this.paginatedSearchOptions.pipe(take(1))
     ]))).subscribe(([sortOptions, searchOptions]) => {
       const updateValue = Object.assign(new PaginatedSearchOptions({}), searchOptions, { sort: sortOptions[0]});
-      const navigationExtras: NavigationExtras = {
-        queryParams: {
+      this.paginationService.updateRoute(this.paginationID,
+        {
           sortDirection: updateValue.sort.direction,
           sortField: updateValue.sort.field,
-        },
-        queryParamsHandling: 'merge'
-      };
-      router.navigate([], navigationExtras);
+        });
       this.paginatedSearchOptions.next(updateValue);
     });
     this.subs.push(subscription);