From b6ab3d2067031dfed44e4015112bd7e46d8758c8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 21 Apr 2021 16:06:15 +0200
Subject: [PATCH] [CST-4087] fix issue with mydspace result default order

---
 .../shared/search/search-configuration.service.ts     | 11 +++++++----
 .../search/search-filters/search-config.model.ts      |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index e10ab668cc..5de30fc4a7 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -21,7 +21,7 @@ import { RouteService } from '../../services/route.service';
 import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../operators';
 import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
 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 { of } from 'rxjs/internal/observable/of';
 import { PaginationService } from '../../pagination/pagination.service';
@@ -216,9 +216,12 @@ export class SearchConfigurationService implements OnDestroy {
       getFirstSucceededRemoteDataPayload(),
       map((searchConfig: SearchConfig) => {
         const sortOptions = [];
-        searchConfig.sortOptions.forEach(sortOption => {
-          sortOptions.push(new SortOptions(sortOption.name, SortDirection.ASC));
-          sortOptions.push(new SortOptions(sortOption.name, SortDirection.DESC));
+        searchConfig.sortOptions.forEach((sortOption: SortOption) => {
+          console.log(sortOption);
+          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;
       }));
diff --git a/src/app/core/shared/search/search-filters/search-config.model.ts b/src/app/core/shared/search/search-filters/search-config.model.ts
index dd7a799f37..725761fe7b 100644
--- a/src/app/core/shared/search/search-filters/search-config.model.ts
+++ b/src/app/core/shared/search/search-filters/search-config.model.ts
@@ -65,6 +65,7 @@ export interface FilterConfig {
  */
 export interface SortOption {
   name: string;
+  sortOrder: string;
 }
 
 /**