hazza/yel-dspace-angular
1
0
Fork 0
forked from hazza/dspace-angular
Code Pull Requests Activity

[CST-4009] fix sort options on pagination change

Browse Source
This commit is contained in:
Alessandro Martelli
2021-04-08 16:18:31 +02:00
parent 1cbd41ef38
commit 23fe338c5d
3 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/+my-dspace-page/my-dspace-page.component.ts
View File

@@ -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$);
}

2
src/app/+search-page/search.component.ts
View File

@@ -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$);
}

13
src/app/core/shared/search/search-configuration.service.ts
View File

@@ -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);