From b3c719c259da04dbe09386843d2d0bc497321cfb Mon Sep 17 00:00:00 2001 From: Camille Moinier Date: Wed, 20 Sep 2023 17:10:48 +0200 Subject: [PATCH] feat: make sort param optionnal --- .../src/app/home/home-header/home-header.component.ts | 10 +++++++--- conf/default.toml | 3 ++- 2 files changed, 9 insertions(+), 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 index 73592cc3aa..5ef3aeb0f5 100644 --- 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 index 44903cbe7f..8788371b6f 100644 --- 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'