From e44adb45329b2d26449d681275413c61b77b8987 Mon Sep 17 00:00:00 2001 From: Olivia Guyot Date: Thu, 22 Feb 2024 10:52:00 +0100 Subject: [PATCH 1/4] type(dropdow-multiselect): fix typings that cause issue when reusing/extending the components --- .../lib/filter-dropdown/filter-dropdown.component.ts | 12 ++++++------ .../search/src/lib/utils/service/fields.service.ts | 2 +- .../src/lib/autocomplete/autocomplete.component.html | 2 +- .../dropdown-multiselect.component.html | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts b/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts index 4406b373d..792e549ea 100644 --- a/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts +++ b/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts @@ -9,8 +9,8 @@ import { Observable, of, switchMap } from 'rxjs' import { catchError, filter, map, startWith } from 'rxjs/operators' import { SearchFacade } from '../state/search.facade' import { SearchService } from '../utils/service/search.service' -import { FieldsService } from '../utils/service/fields.service' -import { FieldAvailableValue } from '../utils/service/fields' +import { FieldsService, FieldValues } from '../utils/service/fields.service' +import { FieldAvailableValue, FieldValue } from '../utils/service/fields' @Component({ selector: 'gn-ui-filter-dropdown', @@ -29,13 +29,13 @@ export class FilterDropdownComponent implements OnInit { ), map((fieldValues) => fieldValues[this.fieldName]), filter((selected) => !!selected), - startWith([]), - catchError(() => of([])) + startWith([] as FieldValues[]), + catchError(() => of([] as FieldValues[])) ) - onSelectedValues(values: (string | number)[]) { + onSelectedValues(values: unknown[]) { this.fieldsService - .buildFiltersFromFieldValues({ [this.fieldName]: values }) + .buildFiltersFromFieldValues({ [this.fieldName]: values as FieldValue[] }) .subscribe((filters) => this.searchService.updateFilters(filters)) } diff --git a/libs/feature/search/src/lib/utils/service/fields.service.ts b/libs/feature/search/src/lib/utils/service/fields.service.ts index a99ddfa0d..075649394 100644 --- a/libs/feature/search/src/lib/utils/service/fields.service.ts +++ b/libs/feature/search/src/lib/utils/service/fields.service.ts @@ -17,7 +17,7 @@ import { FieldFilters } from '@geonetwork-ui/common/domain/model/search' import { marker } from '@biesbjerg/ngx-translate-extract-marker' // key is the field name -export type FieldValues = Record +export type FieldValues = Record marker('search.filters.format') marker('search.filters.inspireKeyword') diff --git a/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html b/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html index 227b9f17b..e542a23df 100644 --- a/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html +++ b/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html @@ -6,7 +6,7 @@ [placeholder]="placeholder" [formControl]="control" [matAutocomplete]="auto" - (keyup.enter)="handleEnter($event.target.value)" + (keyup.enter)="handleEnter(searchInput.value)" />