From ed85f7527387ed9d51c967c43a814882412caaaa Mon Sep 17 00:00:00 2001 From: Florian Necas Date: Thu, 7 Dec 2023 18:39:54 +0100 Subject: [PATCH] feat: update dump, remove log and fix filter --- .../search/src/lib/utils/service/fields.ts | 27 ++++++------------ .../docker-entrypoint-initdb.d/dump | Bin 415147 -> 414602 bytes 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/libs/feature/search/src/lib/utils/service/fields.ts b/libs/feature/search/src/lib/utils/service/fields.ts index c2c267f526..2f3c272367 100644 --- a/libs/feature/search/src/lib/utils/service/fields.ts +++ b/libs/feature/search/src/lib/utils/service/fields.ts @@ -20,7 +20,6 @@ import { RecordsRepositoryInterface } from '@geonetwork-ui/common/domain/reposit import { ElasticsearchService } from '@geonetwork-ui/api/repository/gn4' import { LangService } from '@geonetwork-ui/util/i18n' import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.service.interface' -import { coerce, valid } from 'semver' export type FieldValue = string | number export interface FieldAvailableValue { @@ -87,8 +86,11 @@ export class SimpleSearchField implements AbstractSearchField { }) } - getValuesForFilter(filters: FieldFilters): Observable { - const filter = filters[this.esFieldName] + getValuesForFilter( + filters: FieldFilters, + esFieldName: string = this.esFieldName + ): Observable { + const filter = filters[esFieldName] if (!filter) return of([]) const values = typeof filter === 'string' @@ -397,14 +399,13 @@ export class ContactField extends SimpleSearchField { private langService = this.injector.get(LangService) private platformService = this.injector.get(PlatformServiceInterface) public esFieldName: string - private esResearchName: string private version: Observable = this.platformService .getApiVersion() .pipe(map((version) => version)) constructor(public order: 'asc' | 'desc' = 'asc', public injector: Injector) { super('OrgForResource', order, injector) - this.esFieldName = 'contactForResource.organisationObject.default.keyword' + this.esFieldName = 'OrgForResourceObject.default' } getFiltersForValues(values: FieldValue[]): Observable { @@ -421,23 +422,11 @@ export class ContactField extends SimpleSearchField { switchMap((version) => version == '4.2.2' ? super.getValuesForFilter(filters) - : this.tmpFunction(filters) + : super.getValuesForFilter(filters, this.esFieldName) ) ) } - tmpFunction(filters: FieldFilters) { - const filter = filters[this.esFieldName] - console.log(filters) - if (!filter) return of([]) - const values = - typeof filter === 'string' - ? [filter] - : Object.keys(filter).filter((v) => filter[v]) - console.log(values) - return of(values) - } - getTranslatedAggregations() { return this.searchApiService .search( @@ -484,7 +473,7 @@ export class ContactField extends SimpleSearchField { return this.version.pipe( switchMap((version) => version == '4.2.2' - ? super.getAvailableValues() //TODO copy from simplesearch field + ? super.getAvailableValues() : this.getTranslatedAggregations().pipe( map((response) => response.map((tmp) => { diff --git a/support-services/docker-entrypoint-initdb.d/dump b/support-services/docker-entrypoint-initdb.d/dump index 6a86fefc3d016a0975749cebca0c8f3b4679402e..66d62e47a3a6fab664bfd2c65788fb1ddede67a7 100644 GIT binary patch delta 10098 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