geonetwork-ui 2.11.0-dev.b7f9a229d → 2.11.0-dev.bc1acb627

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/fesm2022/geonetwork-ui.mjs +1280 -1150
  2. package/fesm2022/geonetwork-ui.mjs.map +1 -1
  3. package/index.d.ts +103 -57
  4. package/index.d.ts.map +1 -1
  5. package/package.json +6 -5
  6. package/src/libs/api/metadata-converter/src/lib/dcat-ap/dcat-ap.converter.ts +2 -0
  7. package/src/libs/api/metadata-converter/src/lib/fixtures/mel.records.dataset+featurecatalog.ts +317 -0
  8. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +35 -8
  9. package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts +19 -0
  10. package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts +2 -0
  11. package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts +98 -0
  12. package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts +7 -0
  13. package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts +2 -1
  14. package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +29 -3
  15. package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +5 -34
  16. package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +6 -13
  17. package/src/libs/common/domain/src/lib/model/search/aggregation.model.ts +2 -0
  18. package/src/libs/common/domain/src/lib/model/search/filter.model.ts +4 -1
  19. package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts +1 -1
  20. package/src/libs/common/fixtures/src/lib/records.fixtures.ts +42 -62
  21. package/src/libs/feature/dataviz/src/lib/service/data.service.ts +32 -19
  22. package/src/libs/feature/map/src/index.ts +0 -1
  23. package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts +8 -3
  24. package/src/libs/feature/record/src/lib/state/mdview.effects.ts +3 -1
  25. package/src/libs/feature/record/src/lib/state/mdview.facade.ts +1 -1
  26. package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.html +7 -1
  27. package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts +26 -4
  28. package/src/libs/feature/search/src/lib/geocoding/geocoding.service.ts +41 -2
  29. package/src/libs/feature/search/src/lib/location-search/location-search.component.html +11 -1
  30. package/src/libs/feature/search/src/lib/location-search/location-search.component.ts +77 -3
  31. package/src/libs/feature/search/src/lib/search-filters-summary-item/search-filters-summary-item.component.ts +1 -0
  32. package/src/libs/feature/search/src/lib/state/reducer.ts +1 -4
  33. package/src/libs/feature/search/src/lib/utils/service/fields.service.ts +56 -4
  34. package/src/libs/feature/search/src/lib/utils/service/fields.ts +33 -9
  35. package/src/libs/ui/elements/src/lib/record-feature-catalog/feature-catalog-list/feature-catalog-list.component.html +2 -2
  36. package/src/libs/ui/elements/src/lib/record-feature-catalog/feature-catalog-list/feature-catalog-list.component.ts +2 -2
  37. package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.css +0 -4
  38. package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html +2 -2
  39. package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts +3 -3
  40. package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.ts +2 -1
  41. package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.html +7 -1
  42. package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.ts +26 -3
  43. package/src/libs/util/app-config/src/lib/app-config.ts +29 -0
  44. package/src/libs/util/app-config/src/lib/fixtures.ts +34 -1
  45. package/src/libs/util/app-config/src/lib/model.ts +21 -2
  46. package/translations/de.json +8 -2
  47. package/translations/en.json +8 -2
  48. package/translations/es.json +8 -2
  49. package/translations/fr.json +12 -6
  50. package/translations/it.json +8 -2
  51. package/translations/nl.json +8 -2
  52. package/translations/pt.json +8 -2
  53. package/translations/sk.json +8 -2
  54. package/src/libs/feature/map/src/lib/style/index.ts +0 -2
  55. package/src/libs/feature/map/src/lib/style/map-style.fixtures.ts +0 -47
  56. package/src/libs/feature/map/src/lib/style/map-style.service.ts +0 -108
@@ -3,18 +3,38 @@ import {
3
3
  Component,
4
4
  EventEmitter,
5
5
  inject,
6
+ InjectionToken,
6
7
  Input,
7
8
  Output,
8
- TemplateRef,
9
9
  } from '@angular/core'
10
10
  import { Observable } from 'rxjs'
11
+ import pointer from 'jsonpointer'
11
12
  import { GeocodingResult } from '@geospatial-sdk/geocoding'
13
+ import { Geometry } from 'geojson'
12
14
  import {
13
15
  AutocompleteComponent,
14
16
  AutocompleteItem,
15
17
  } from '../../../../../../libs/ui/inputs/src'
18
+ import { BoundingBox, getGeometryBoundingBox } from '../../../../../../libs/util/shared/src'
16
19
  import { GeocodingService } from '../geocoding/geocoding.service'
17
20
 
21
+ // JSON Pointers resolved against a geocoding result to build the labels shown in the dropdown
22
+ export interface GeocodingProviderLabels {
23
+ main?: string
24
+ secondary?: string
25
+ tertiary?: string
26
+ }
27
+
28
+ export interface LocationBbox {
29
+ bbox: BoundingBox
30
+ label: string
31
+ }
32
+
33
+ export const GEOCODING_PROVIDER_LABELS =
34
+ new InjectionToken<GeocodingProviderLabels>('geocodingProviderLabels', {
35
+ factory: () => ({}),
36
+ })
37
+
18
38
  @Component({
19
39
  selector: 'gn-ui-location-search',
20
40
  templateUrl: './location-search.component.html',
@@ -24,17 +44,71 @@ import { GeocodingService } from '../geocoding/geocoding.service'
24
44
  })
25
45
  export class LocationSearchComponent {
26
46
  private geocodingService = inject(GeocodingService)
47
+ private labels = inject(GEOCODING_PROVIDER_LABELS)
27
48
 
28
49
  @Input() placeholder = ''
29
- @Input() displayWithTemplate?: TemplateRef<{ $implicit: GeocodingResult }>
30
50
  @Output() resultSelected = new EventEmitter<GeocodingResult>()
51
+ @Output() bboxSelected = new EventEmitter<LocationBbox>()
31
52
 
32
53
  displayWithFn = (item: AutocompleteItem) => (item as GeocodingResult).label
33
54
 
34
55
  searchAction = (text: string): Observable<AutocompleteItem[]> =>
35
56
  this.geocodingService.query(text)
36
57
 
58
+ getSecondaryLabel(result: GeocodingResult): string | undefined {
59
+ return this.resolveLabel(result, this.labels.secondary)
60
+ }
61
+
62
+ getMainLabel(result: GeocodingResult): string {
63
+ return this.resolveLabel(result, this.labels.main) ?? result.label
64
+ }
65
+
66
+ getTertiaryLabel(result: GeocodingResult): string | undefined {
67
+ return this.resolveLabel(result, this.labels.tertiary)
68
+ }
69
+
70
+ getDisplayLabel(result: GeocodingResult): string {
71
+ const tertiary = this.getTertiaryLabel(result)
72
+ return this.getMainLabel(result) + (tertiary ? ', ' + tertiary : '')
73
+ }
74
+
75
+ private resolveLabel(
76
+ result: GeocodingResult,
77
+ path?: string
78
+ ): string | undefined {
79
+ if (!path) return undefined
80
+ let value: unknown
81
+ try {
82
+ value = pointer.get(result, path)
83
+ } catch {
84
+ return undefined
85
+ }
86
+ const values = Array.isArray(value) ? value : [value]
87
+ const label = values
88
+ .filter((v) => typeof v === 'string' || typeof v === 'number')
89
+ .join(', ')
90
+ return label || undefined
91
+ }
92
+
93
+ // geoplateforme keeps a simplified geometry in geom and puts the real one,
94
+ // as a JSON string, in properties.truegeometry when returnTrueGeometry is set
95
+ private getGeometry(result: GeocodingResult): Geometry | null {
96
+ const trueGeometry = result.properties?.['truegeometry']
97
+ if (typeof trueGeometry === 'string') {
98
+ return JSON.parse(trueGeometry)
99
+ }
100
+ return (trueGeometry as Geometry) ?? result.geom
101
+ }
102
+
37
103
  handleItemSelected(item: AutocompleteItem) {
38
- this.resultSelected.emit(item as GeocodingResult)
104
+ const result = item as GeocodingResult
105
+ this.resultSelected.emit(result)
106
+ const geometry = this.getGeometry(result)
107
+ if (geometry) {
108
+ this.bboxSelected.emit({
109
+ bbox: getGeometryBoundingBox(geometry),
110
+ label: this.getDisplayLabel(result),
111
+ })
112
+ }
39
113
  }
40
114
  }
@@ -21,6 +21,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
21
21
  marker('search.filters.summaryLabel.user')
22
22
  marker('search.filters.summaryLabel.changeDate')
23
23
  marker('search.filters.summaryLabel.resourceCreationRevisionDate')
24
+ marker('search.filters.summaryLabel.temporalExtent')
24
25
 
25
26
  const OPEN_BOUND = '…'
26
27
 
@@ -8,7 +8,6 @@ import {
8
8
  SortByField,
9
9
  } from '../../../../../../libs/common/domain/src/lib/model/search'
10
10
  import { DEFAULT_PAGE_SIZE, FIELDS_SUMMARY } from '../constants'
11
- import { getOptionalSearchConfig } from '../../../../../../libs/util/app-config/src'
12
11
  import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
13
12
 
14
13
  export const SEARCH_FEATURE_KEY = 'searchState'
@@ -56,9 +55,7 @@ export const initSearch = (): SearchStateSearch => {
56
55
  },
57
56
  params: {
58
57
  filters: {},
59
- pageSize: getOptionalSearchConfig()?.LIMIT
60
- ? getOptionalSearchConfig().LIMIT
61
- : DEFAULT_PAGE_SIZE,
58
+ pageSize: DEFAULT_PAGE_SIZE,
62
59
  currentPage: 0,
63
60
  favoritesOnly: false,
64
61
  useSpatialFilter: true,
@@ -1,4 +1,4 @@
1
- import { Injectable, Injector, inject } from '@angular/core'
1
+ import { inject, Injectable, InjectionToken, Injector } from '@angular/core'
2
2
  import {
3
3
  AbstractSearchField,
4
4
  AvailableServicesField,
@@ -11,11 +11,11 @@ import {
11
11
  MultilingualSearchField,
12
12
  OrganizationSearchField,
13
13
  OwnerSearchField,
14
+ RecordKindField,
14
15
  ResourceCreationRevisionDateSearchField,
15
16
  ResourceTypeLegacyField,
16
17
  SimpleSearchField,
17
18
  TranslatedSearchField,
18
- RecordKindField,
19
19
  UserSearchField,
20
20
  } from './fields'
21
21
  import { forkJoin, Observable, of } from 'rxjs'
@@ -45,14 +45,29 @@ marker('search.filters.publisherOrg')
45
45
  marker('search.filters.user')
46
46
  marker('search.filters.changeDate')
47
47
  marker('search.filters.resourceCreationRevisionDate')
48
+ marker('search.filters.temporalExtent')
48
49
  marker('search.filters.spatialExtent')
50
+ marker('search.filters.documentStandard')
51
+
52
+ export interface CustomSearchField {
53
+ name: string
54
+ baseFilter: string
55
+ excludeValues?: string[]
56
+ includeValues?: string[]
57
+ }
58
+
59
+ export const CUSTOM_FIELDS = new InjectionToken<CustomSearchField[]>(
60
+ 'custom-fields'
61
+ )
49
62
  @Injectable({
50
63
  providedIn: 'root',
51
64
  })
52
65
  export class FieldsService {
53
66
  protected injector = inject(Injector)
67
+ private customFields =
68
+ inject<CustomSearchField[]>(CUSTOM_FIELDS, { optional: true }) ?? []
54
69
 
55
- protected fields = {
70
+ private baseFields: Record<string, AbstractSearchField> = {
56
71
  organization: new OrganizationSearchField(this.injector),
57
72
  format: new SimpleSearchField('format', this.injector, 'asc'),
58
73
  resourceType: new ResourceTypeLegacyField(this.injector), // Deprecated, use `recordKind` instead
@@ -101,9 +116,46 @@ export class FieldsService {
101
116
  this.injector,
102
117
  'desc'
103
118
  ),
119
+ temporalExtent: new DateRangeSearchField(
120
+ 'resourceTemporalExtentDateRange',
121
+ this.injector,
122
+ 'desc'
123
+ ),
104
124
  availableServices: new AvailableServicesField(this.injector),
105
125
  spatialExtent: new BoundingBoxSearchField('spatialExtent', this.injector),
106
- } as Record<string, AbstractSearchField>
126
+ }
127
+
128
+ protected fields: Record<string, AbstractSearchField>
129
+
130
+ constructor() {
131
+ this.fields = { ...this.baseFields }
132
+ for (const customField of this.customFields) {
133
+ const baseField = this.baseFields[customField.baseFilter]
134
+ if (!(baseField instanceof SimpleSearchField)) {
135
+ console.warn(
136
+ `The custom field '${customField.name}' relies on a base field '${
137
+ customField.baseFilter
138
+ }' that is not supported. This field will be ignored.`
139
+ )
140
+ continue
141
+ }
142
+ if (!customField.name.includes(':')) {
143
+ console.warn(
144
+ `The custom field '${customField.name}' is not scoped with a prefix. Custom fields must have their names prefixed, for instance "myOrg:myKeywords". This field will be ignored.`
145
+ )
146
+ continue
147
+ }
148
+ const newField = baseField.clone()
149
+ newField.setFieldIdentifier(customField.name)
150
+ if (customField.includeValues) {
151
+ newField.includeValues = customField.includeValues
152
+ }
153
+ if (customField.excludeValues) {
154
+ newField.excludeValues = customField.excludeValues
155
+ }
156
+ this.fields[customField.name] = newField
157
+ }
158
+ }
107
159
 
108
160
  get supportedFields() {
109
161
  return Object.keys(this.fields)
@@ -53,6 +53,15 @@ export class SimpleSearchField implements AbstractSearchField {
53
53
  // FIXME: this is required to register runtime fields; abstract this as well
54
54
  protected esService = this.injector.get(ElasticsearchService)
55
55
 
56
+ private customIdentifier?: string
57
+
58
+ protected get fieldIdentifier(): string {
59
+ return this.customIdentifier ?? this.esFieldName
60
+ }
61
+
62
+ public includeValues: string[] = []
63
+ public excludeValues: string[] = []
64
+
56
65
  constructor(
57
66
  protected esFieldName: string,
58
67
  protected injector: Injector,
@@ -60,13 +69,24 @@ export class SimpleSearchField implements AbstractSearchField {
60
69
  protected orderType: 'key' | 'count' = 'key'
61
70
  ) {}
62
71
 
72
+ public setFieldIdentifier(fieldIdentifier: string) {
73
+ this.customIdentifier = fieldIdentifier
74
+ this.esService.registerFieldAlias(fieldIdentifier, this.esFieldName)
75
+ }
76
+
63
77
  protected getAggregations(): AggregationsParams {
64
78
  return {
65
- [this.esFieldName]: {
79
+ [this.fieldIdentifier]: {
66
80
  type: 'terms',
67
81
  field: this.esFieldName,
68
82
  limit: 1000,
69
83
  sort: [this.order, this.orderType],
84
+ ...(this.includeValues?.length && {
85
+ includeValues: this.includeValues,
86
+ }),
87
+ ...(this.excludeValues?.length && {
88
+ excludeValues: this.excludeValues,
89
+ }),
70
90
  },
71
91
  }
72
92
  }
@@ -79,7 +99,7 @@ export class SimpleSearchField implements AbstractSearchField {
79
99
  return this.repository.aggregate(this.getAggregations()).pipe(
80
100
  map(
81
101
  (response) =>
82
- (response[this.esFieldName] as AggregationBuckets).buckets || []
102
+ (response[this.fieldIdentifier] as AggregationBuckets).buckets || []
83
103
  ),
84
104
  switchMap((buckets: TermBucket[]) => {
85
105
  const bucketPromises = buckets.map(async (bucket) => ({
@@ -97,7 +117,7 @@ export class SimpleSearchField implements AbstractSearchField {
97
117
  // FieldValue[]
98
118
  if (this.getType() === 'values') {
99
119
  return of({
100
- [this.esFieldName]: (values as FieldValue[]).reduce((acc, val) => {
120
+ [this.fieldIdentifier]: (values as FieldValue[]).reduce((acc, val) => {
101
121
  const value = val.toString()
102
122
  if (value !== '') {
103
123
  return { ...acc, [value]: true }
@@ -108,13 +128,13 @@ export class SimpleSearchField implements AbstractSearchField {
108
128
  }
109
129
  // DateRange
110
130
  return of({
111
- [this.esFieldName]: values[0] !== '' ? values[0] : {},
131
+ [this.fieldIdentifier]: values[0] !== '' ? values[0] : {},
112
132
  })
113
133
  }
114
134
  getValuesForFilter(
115
135
  filters: FieldFilters
116
136
  ): Observable<FieldValue[] | FieldValue | DateRange> {
117
- const filter = filters[this.esFieldName]
137
+ const filter = filters[this.fieldIdentifier]
118
138
  if (!filter) return of([])
119
139
  // filter by expression
120
140
  if (typeof filter === 'string') {
@@ -132,6 +152,10 @@ export class SimpleSearchField implements AbstractSearchField {
132
152
  getType(): FieldType {
133
153
  return 'values'
134
154
  }
155
+
156
+ clone(): typeof this {
157
+ return Object.create(this)
158
+ }
135
159
  }
136
160
 
137
161
  export class TranslatedSearchField extends SimpleSearchField {
@@ -476,12 +500,12 @@ export class BoundingBoxSearchField extends SimpleSearchField {
476
500
 
477
501
  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
478
502
  return of({
479
- [this.esFieldName]: values.map(Number) as BoundingBox,
503
+ [this.fieldIdentifier]: values.map(Number) as BoundingBox,
480
504
  })
481
505
  }
482
506
 
483
507
  getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
484
- const filter = filters[this.esFieldName]
508
+ const filter = filters[this.fieldIdentifier]
485
509
  return of(isBoundingBox(filter) ? filter : [])
486
510
  }
487
511
 
@@ -599,7 +623,7 @@ export class RecordKindField extends SimpleSearchField {
599
623
 
600
624
  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters | string> {
601
625
  const filters: FieldFilters = {
602
- [this.esFieldName]: values.reduce((acc, value) => {
626
+ [this.fieldIdentifier]: values.reduce((acc, value) => {
603
627
  if (value === '') return { ...acc, [value]: true }
604
628
 
605
629
  const keysToAdd = this.TYPE_MAPPING[value] || [value]
@@ -626,7 +650,7 @@ export class RecordKindField extends SimpleSearchField {
626
650
  }
627
651
 
628
652
  getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
629
- const filter = filters[this.esFieldName]
653
+ const filter = filters[this.fieldIdentifier]
630
654
  if (!filter) return of([])
631
655
 
632
656
  const activeValues = Object.keys(filter).filter((v) => filter[v])
@@ -17,9 +17,9 @@
17
17
  <ng-template #titleTemplate>
18
18
  <div class="px-2">
19
19
  <div class="text-lg font-bold">{{ featureType.name }}</div>
20
- @if (featureType.definition) {
20
+ @if (featureType.description) {
21
21
  <div class="text-sm">
22
- {{ featureType.definition }}
22
+ {{ featureType.description }}
23
23
  </div>
24
24
  }
25
25
  </div>
@@ -19,7 +19,7 @@ import { iconoirList } from '@ng-icons/iconoir'
19
19
  marker('feature.catalog.attribute.type')
20
20
  marker('feature.catalog.attribute.name')
21
21
  marker('feature.catalog.attribute.code')
22
- marker('feature.catalog.attribute.definition')
22
+ marker('feature.catalog.attribute.description')
23
23
  marker('feature.catalog.attribute.values')
24
24
 
25
25
  interface ColumnDefinition {
@@ -56,7 +56,7 @@ export class FeatureCatalogListComponent {
56
56
  readonly COLUMNS_DEFAULT: ColumnDefinition[] = [
57
57
  { key: 'type', width: '25%' },
58
58
  { key: 'name', width: '40%' },
59
- { key: 'definition', width: 'minmax(0px, 1fr)' },
59
+ { key: 'description', width: 'minmax(0px, 1fr)' },
60
60
  ]
61
61
 
62
62
  readonly COLUMN_VALUES: ColumnDefinition = {
@@ -16,10 +16,6 @@ gn-ui-button {
16
16
  --gn-ui-button-padding: 0;
17
17
  font-size: 1em;
18
18
  }
19
- ng-icon.search {
20
- margin-top: 0.6rem;
21
- margin-left: 0.6rem;
22
- }
23
19
  gn-ui-button:last-of-type {
24
20
  --gn-ui-button-rounded: 0 var(--gn-ui-text-input-rounded, 0.25em)
25
21
  var(--gn-ui-text-input-rounded, 0.25em) 0;
@@ -1,9 +1,9 @@
1
1
  <span class="w-full inline-block relative">
2
2
  @if (!allowSubmit) {
3
3
  <div
4
- class="absolute inset-y-[--icon-padding] left-[--icon-padding] w-[--icon-width] pointer-events-none"
4
+ class="absolute inset-y-[--icon-padding] left-[--icon-padding] w-[--icon-width] pointer-events-none flex items-center justify-center"
5
5
  >
6
- <ng-icon name="iconoirSearch" class="text-primary search"></ng-icon>
6
+ <ng-icon name="iconoirSearch" class="text-primary"></ng-icon>
7
7
  </div>
8
8
  }
9
9
  <div class="flex flex-row">
@@ -134,13 +134,13 @@ export class AutocompleteComponent
134
134
  getExtraClass(): string {
135
135
  if (this.allowSubmit) {
136
136
  if (this.enterButton) {
137
- return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+var(--icon-padding))] inset-y-[--icon-padding]'
137
+ return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+var(--icon-padding))] top-1/2 -translate-y-1/2'
138
138
  } else {
139
- return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+0.25*var(--icon-width))] inset-y-[calc(0.25*var(--icon-width))]'
139
+ return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+0.25*var(--icon-width))] top-1/2 -translate-y-1/2'
140
140
  }
141
141
  } else {
142
142
  if (!this.enterButton) {
143
- return 'border rounded-lg absolute w-8 h-8 right-2 inset-y-2'
143
+ return 'border rounded-lg absolute w-8 h-8 right-2 top-1/2 -translate-y-1/2'
144
144
  }
145
145
  }
146
146
  return 'border rounded-lg absolute w-8 h-8'
@@ -56,7 +56,8 @@ export class SearchFeatureCatalogComponent {
56
56
  const fuzzyFilter = createFuzzyFilter(searchTerm)
57
57
  return (
58
58
  fuzzyFilter(featureType.name) ||
59
- (featureType.definition && fuzzyFilter(featureType.definition))
59
+ (featureType.description &&
60
+ fuzzyFilter(featureType.description))
60
61
  )
61
62
  }
62
63
  )
@@ -58,7 +58,12 @@
58
58
  [class]="
59
59
  (hasSelection
60
60
  ? 'border-b-[1px] border-gray-400 pb-[20px]'
61
- : 'pb-[12px]') + ' text-black'
61
+ : 'pb-[12px]') + ' text-black flex flex-col gap-[8px]'
62
+ "
63
+ style="
64
+ --gn-ui-text-input-rounded: 8px;
65
+ --gn-ui-text-input-border-size: 1px;
66
+ --gn-ui-text-input-padding: 6px;
62
67
  "
63
68
  >
64
69
  <gn-ui-drag-and-drop-file-input
@@ -74,6 +79,7 @@
74
79
  (errorChange)="handleFileError($event)"
75
80
  data-cy="importGeojson"
76
81
  ></gn-ui-drag-and-drop-file-input>
82
+ <ng-content></ng-content>
77
83
  </div>
78
84
 
79
85
  @if (hasSelection) {
@@ -53,6 +53,12 @@ const LABEL_FROM_FILE = marker('search.filters.spatialExtent.bboxFromFile')
53
53
  const LABEL_FROM_FILE_DELETE = marker(
54
54
  'search.filters.spatialExtent.bboxFromFileDelete'
55
55
  )
56
+ const LABEL_FROM_LOCATION = marker(
57
+ 'search.filters.spatialExtent.bboxFromLocation'
58
+ )
59
+ const LABEL_FROM_LOCATION_DELETE = marker(
60
+ 'search.filters.spatialExtent.bboxFromLocationDelete'
61
+ )
56
62
  const LABEL_INITIAL = marker('search.filters.spatialExtent.bboxInitial')
57
63
  const LABEL_INITIAL_DELETE = marker(
58
64
  'search.filters.spatialExtent.bboxInitialDelete'
@@ -105,6 +111,7 @@ export class SpatialExtentDropdownComponent {
105
111
 
106
112
  bbox: BoundingBox | null = null
107
113
  fileName = ''
114
+ locationName = ''
108
115
 
109
116
  @ViewChild('overlayOrigin') overlayOrigin: CdkOverlayOrigin
110
117
  @ViewChild(CdkConnectedOverlay) overlay: CdkConnectedOverlay
@@ -138,15 +145,19 @@ export class SpatialExtentDropdownComponent {
138
145
  }
139
146
 
140
147
  get selectionLabelKey() {
141
- return this.fileName ? LABEL_FROM_FILE : LABEL_INITIAL
148
+ if (this.fileName) return LABEL_FROM_FILE
149
+ if (this.locationName) return LABEL_FROM_LOCATION
150
+ return LABEL_INITIAL
142
151
  }
143
152
 
144
153
  get selectionDeleteLabelKey() {
145
- return this.fileName ? LABEL_FROM_FILE_DELETE : LABEL_INITIAL_DELETE
154
+ if (this.fileName) return LABEL_FROM_FILE_DELETE
155
+ if (this.locationName) return LABEL_FROM_LOCATION_DELETE
156
+ return LABEL_INITIAL_DELETE
146
157
  }
147
158
 
148
159
  get selectionLabelParams() {
149
- return { fileName: this.fileName }
160
+ return { fileName: this.fileName, locationName: this.locationName }
150
161
  }
151
162
 
152
163
  openOverlay() {
@@ -186,6 +197,7 @@ export class SpatialExtentDropdownComponent {
186
197
  }
187
198
  this.bbox = bbox
188
199
  this.fileName = file.name
200
+ this.locationName = ''
189
201
  this.bboxChange.emit(bbox)
190
202
  this.cd.markForCheck()
191
203
  } catch {
@@ -194,6 +206,16 @@ export class SpatialExtentDropdownComponent {
194
206
  }
195
207
  }
196
208
 
209
+ setLocationBbox(bbox: BoundingBox, name: string) {
210
+ this.errorKey = null
211
+ this.bbox = bbox
212
+ this.locationName = name
213
+ this.fileName = ''
214
+ this.fileInput?.clear()
215
+ this.bboxChange.emit(bbox)
216
+ this.cd.markForCheck()
217
+ }
218
+
197
219
  handleFileError(error: DragAndDropFileInputError) {
198
220
  if (error === 'file-too-large') {
199
221
  this.setError(marker('search.filters.spatialExtent.error.fileTooLarge'), {
@@ -213,6 +235,7 @@ export class SpatialExtentDropdownComponent {
213
235
  removeSelection(event: Event) {
214
236
  this.bbox = null
215
237
  this.fileName = ''
238
+ this.locationName = ''
216
239
  this.errorKey = null
217
240
  this.fileInput?.clear()
218
241
  this.bboxChange.emit(null)
@@ -255,6 +255,7 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
255
255
  'spatial_extent_max_file_size',
256
256
  'geocoding_provider',
257
257
  'geocoding_provider_options',
258
+ 'geocoding_provider_labels',
258
259
  ],
259
260
  warnings,
260
261
  errors
@@ -267,6 +268,18 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
267
268
  warnings,
268
269
  errors
269
270
  )
271
+ const parsedCustomFilters = parseMultiConfigSection(
272
+ parsed,
273
+ 'custom_filter',
274
+ ['name', 'base_filter'],
275
+ ['exclude_values', 'include_values', 'label_key'],
276
+ warnings,
277
+ errors
278
+ )
279
+ const parsedGeocodingProviderLabels =
280
+ parsedSearchSection?.geocoding_provider_labels as
281
+ | Record<string, string>
282
+ | undefined
270
283
  searchConfig =
271
284
  parsedSearchSection === null
272
285
  ? null
@@ -283,12 +296,28 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
283
296
  filters: param.filters,
284
297
  })),
285
298
  ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
299
+ CUSTOM_FILTERS: (parsedCustomFilters ?? []).map(
300
+ (customFilter) => ({
301
+ name: customFilter.name,
302
+ baseFilter: customFilter.base_filter,
303
+ excludeValues: customFilter.exclude_values,
304
+ includeValues: customFilter.include_values,
305
+ labelKey: customFilter.label_key,
306
+ })
307
+ ),
286
308
  LIMIT: parsedSearchSection.limit,
287
309
  SPATIAL_EXTENT_MAX_FILE_SIZE:
288
310
  parsedSearchSection.spatial_extent_max_file_size,
289
311
  GEOCODING_PROVIDER: parsedSearchSection.geocoding_provider,
290
312
  GEOCODING_PROVIDER_OPTIONS:
291
313
  parsedSearchSection.geocoding_provider_options,
314
+ GEOCODING_PROVIDER_LABELS: parsedGeocodingProviderLabels
315
+ ? {
316
+ MAIN: parsedGeocodingProviderLabels.main,
317
+ SECONDARY: parsedGeocodingProviderLabels.secondary,
318
+ TERTIARY: parsedGeocodingProviderLabels.tertiary,
319
+ }
320
+ : undefined,
292
321
  } as SearchConfig)
293
322
 
294
323
  const parsedMetadataQualitySection = parseConfigSection(
@@ -42,9 +42,25 @@ record_kind_quick_filter = false
42
42
  filter_geometry_url = 'https://my.domain.org/geom.json'
43
43
  do_not_use_default_search_preset = false
44
44
  geocoding_provider = "geoplateforme"
45
+ geocoding_provider_options.index = "poi"
45
46
  geocoding_provider_options.category = "administratif"
46
47
  geocoding_provider_options.limit = 5
47
- advanced_filters = ['publicationYear', 'documentStandard', 'inspireKeyword', 'topic', 'license']
48
+ geocoding_provider_labels.main = '/properties/name/0'
49
+ geocoding_provider_labels.secondary = '/properties/citycode/0'
50
+ geocoding_provider_labels.tertiary = '/properties/category/1'
51
+ advanced_filters = ['publicationYear', 'documentStandard', 'inspireKeyword', 'topic', 'license', 'myOrg:firstCustomFilter', 'myOrg:secondCustomFilter']
52
+
53
+ [[custom_filter]]
54
+ name = 'myOrg:firstCustomFilter'
55
+ base_filter = 'keyword'
56
+ exclude_values = ['my keyword 1', 'my keyword 2']
57
+ label_key = 'myOrg.firstCustomFilter'
58
+
59
+ [[custom_filter]]
60
+ name = 'myOrg:secondCustomFilter'
61
+ base_filter = 'keyword'
62
+ include_values = ['my keyword 3', 'my keyword 4']
63
+ label_key = 'myOrg.secondCustomFilter'
48
64
 
49
65
  [[search_preset]]
50
66
  sort = "-createDate"
@@ -84,6 +100,23 @@ main_color = "#212029" # All-purpose text color
84
100
  background_color = "#fdfbff"
85
101
  `
86
102
 
103
+ export const customFilterMissingMandatoryConfigFixture = () => `
104
+ [global]
105
+ geonetwork4_api_url = "/geonetwork/srv/api"
106
+
107
+ [theme]
108
+ primary_color = "#093564"
109
+ secondary_color = "#c2e9dc"
110
+ main_color = "#212029" # All-purpose text color
111
+ background_color = "#fdfbff"
112
+
113
+ [search]
114
+ advanced_filters = ['myOrg:firstCustomFilter']
115
+
116
+ [[custom_filter]]
117
+ name = 'myOrg:firstCustomFilter'
118
+ `
119
+
87
120
  export const mapConfigFixture = (): MapConfig => ({
88
121
  MAX_ZOOM: 10,
89
122
  MAX_EXTENT: [-418263.418776, 5251529.591305, 961272.067714, 6706890.609855],