[CST-4087] fix issue with mydspace result default order

This commit is contained in:
Giuseppe Digilio
2021-04-21 16:06:15 +02:00
committed by Alessandro Martelli
parent a205aa02b3
commit b6ab3d2067
2 changed files with 8 additions and 4 deletions

View File

@@ -21,7 +21,7 @@ import { RouteService } from '../../services/route.service';
import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../operators'; import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../operators';
import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util'; import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils'; import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
import { SearchConfig } from './search-filters/search-config.model'; import { SearchConfig, SortOption } from './search-filters/search-config.model';
import { SearchService } from './search.service'; import { SearchService } from './search.service';
import { of } from 'rxjs/internal/observable/of'; import { of } from 'rxjs/internal/observable/of';
import { PaginationService } from '../../pagination/pagination.service'; import { PaginationService } from '../../pagination/pagination.service';
@@ -216,9 +216,12 @@ export class SearchConfigurationService implements OnDestroy {
getFirstSucceededRemoteDataPayload(), getFirstSucceededRemoteDataPayload(),
map((searchConfig: SearchConfig) => { map((searchConfig: SearchConfig) => {
const sortOptions = []; const sortOptions = [];
searchConfig.sortOptions.forEach(sortOption => { searchConfig.sortOptions.forEach((sortOption: SortOption) => {
sortOptions.push(new SortOptions(sortOption.name, SortDirection.ASC)); console.log(sortOption);
sortOptions.push(new SortOptions(sortOption.name, SortDirection.DESC)); const firstOrder = (sortOption.sortOrder.toLowerCase() === SortDirection.ASC.toLowerCase()) ? SortDirection.ASC : SortDirection.DESC;
const secondOrder = (sortOption.sortOrder.toLowerCase() !== SortDirection.ASC.toLowerCase()) ? SortDirection.ASC : SortDirection.DESC;
sortOptions.push(new SortOptions(sortOption.name, firstOrder));
sortOptions.push(new SortOptions(sortOption.name, secondOrder));
}); });
return sortOptions; return sortOptions;
})); }));

View File

@@ -65,6 +65,7 @@ export interface FilterConfig {
*/ */
export interface SortOption { export interface SortOption {
name: string; name: string;
sortOrder: string;
} }
/** /**