feat: make sort param optionnal

geonetwork · Sep 20, 2023 · b3c719c · b3c719c
1 parent db74690
commit b3c719c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/apps/datahub/src/app/home/home-header/home-header.component.ts b/apps/datahub/src/app/home/home-header/home-header.component.ts
@@ -22,7 +22,7 @@ import { map } from 'rxjs/operators'
 import { ROUTER_ROUTE_NEWS } from '../../router/constants'
 import { firstValueFrom, lastValueFrom } from 'rxjs'
 import { CatalogRecord } from '@geonetwork-ui/common/domain/record'
-import { sortByToString } from '@geonetwork-ui/util/shared'
+import { sortByFromString } from '@geonetwork-ui/util/shared'
 
 marker('datahub.header.myfavorites')
 marker('datahub.header.lastRecords')
@@ -84,7 +84,11 @@ export class HomeHeaderComponent {
         customSearchParameters.filters
       )
     )
-    const sortBy = await firstValueFrom(this.searchFacade.sortBy$)
-    this.searchService.setSortAndFilters(searchFilters, sortBy)
+    if (customSearchParameters.sort) {
+      const sortBy = sortByFromString(customSearchParameters.sort[0])
+      this.searchService.setSortAndFilters(searchFilters, sortBy)
+    } else {
+      this.searchService.setFilters(searchFilters)
+    }
   }
 }
diff --git a/conf/default.toml b/conf/default.toml
@@ -75,7 +75,7 @@ background_color = "#fdfbff"
 
 # One or several search presets can be defined here; every search preset is composed of:
 # - a name (which can be a translation key)
-# - a sort criteria: either `createDate`, `userSavedCount` or `_score` (prepend with `-` for descending sort)
+# - a sort criteria: either `createDate`, `userSavedCount` or `_score` (prepend with `-` for descending sort) (optionnal)
 # - filters which can be expressed like so:
 # [[search_preset]]
 #     name = 'filterByName'
@@ -88,6 +88,7 @@ background_color = "#fdfbff"
 #     filters.publicationYear = ['2023', '2022']
 #     filters.isSpatial = ['yes']
 #     filters.license = ['unknown']
+#     sort = ['createDate']
 # [[search_preset]]
 #     name = 'otherFilterName'
 #     filters.q = 'Other Full text search'