geonetwork-ui 2.11.0-dev.e430b2fe8 → 2.11.0-dev.fb3fea50c
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.
- package/fesm2022/geonetwork-ui.mjs +648 -201
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/index.d.ts +142 -31
- package/index.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +76 -34
- package/src/libs/common/domain/src/lib/model/search/filter.model.ts +13 -1
- package/src/libs/feature/map/src/lib/add-layer-from-file/add-layer-from-file.component.html +1 -0
- package/src/libs/feature/notifications/src/lib/notifications.service.ts +6 -4
- package/src/libs/feature/router/src/lib/default/state/query-params.utils.ts +1 -1
- package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.html +12 -4
- package/src/libs/feature/search/src/lib/filter-dropdown/filter-dropdown.component.ts +58 -19
- package/src/libs/feature/search/src/lib/search-filters-summary-item/search-filters-summary-item.component.ts +18 -8
- package/src/libs/feature/search/src/lib/utils/service/fields.service.ts +9 -1
- package/src/libs/feature/search/src/lib/utils/service/fields.ts +43 -2
- package/src/libs/ui/inputs/src/index.ts +2 -0
- package/src/libs/ui/inputs/src/lib/date-adapter.providers.ts +30 -0
- package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts +3 -24
- package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.css +37 -3
- package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.html +135 -16
- package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.ts +166 -29
- package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.ts +3 -7
- package/src/libs/ui/inputs/src/lib/drag-and-drop-file-input/drag-and-drop-file-input.component.css +1 -0
- package/src/libs/ui/inputs/src/lib/drag-and-drop-file-input/drag-and-drop-file-input.component.html +20 -7
- package/src/libs/ui/inputs/src/lib/drag-and-drop-file-input/drag-and-drop-file-input.component.ts +46 -5
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html +1 -1
- package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.css +0 -0
- package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.html +111 -0
- package/src/libs/ui/inputs/src/lib/spatial-extent-dropdown/spatial-extent-dropdown.component.ts +215 -0
- package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts +2 -0
- package/src/libs/util/app-config/src/lib/app-config.ts +3 -0
- package/src/libs/util/app-config/src/lib/model.ts +1 -0
- package/src/libs/util/shared/src/index.ts +1 -0
- package/src/libs/util/shared/src/lib/autofocus.directive.ts +26 -0
- package/src/libs/util/shared/src/lib/services/date.service.ts +3 -3
- package/src/libs/util/shared/src/lib/utils/file.ts +15 -0
- package/src/libs/util/shared/src/lib/utils/geojson.ts +8 -0
- package/src/libs/util/shared/src/lib/utils/index.ts +1 -0
- package/tailwind.base.css +5 -0
- package/translations/de.json +16 -2
- package/translations/en.json +15 -1
- package/translations/es.json +14 -0
- package/translations/fr.json +16 -2
- package/translations/it.json +14 -0
- package/translations/nl.json +14 -0
- package/translations/pt.json +14 -0
- package/translations/sk.json +14 -0
|
@@ -34,7 +34,12 @@ import {
|
|
|
34
34
|
LanguageCode,
|
|
35
35
|
} from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
36
36
|
import { TranslateService } from '@ngx-translate/core'
|
|
37
|
-
import {
|
|
37
|
+
import {
|
|
38
|
+
bboxToPolygon,
|
|
39
|
+
BoundingBox,
|
|
40
|
+
getGeometryBoundingBox,
|
|
41
|
+
isBoundingBox,
|
|
42
|
+
} from '../../../../../../../libs/util/shared/src'
|
|
38
43
|
import { getLength as getGeodesicLength } from 'ol/sphere.js'
|
|
39
44
|
import { LineString } from 'ol/geom.js'
|
|
40
45
|
|
|
@@ -49,7 +54,10 @@ export class ElasticsearchService {
|
|
|
49
54
|
|
|
50
55
|
// runtime fields are computed using a Painless script
|
|
51
56
|
// see: https://www.elastic.co/guide/en/elasticsearch/reference/current/runtime-mapping-fields.html
|
|
52
|
-
private runtimeFields: Record<
|
|
57
|
+
private runtimeFields: Record<
|
|
58
|
+
string,
|
|
59
|
+
{ script: string; type: 'keyword' | 'date' }
|
|
60
|
+
> = {}
|
|
53
61
|
|
|
54
62
|
// we're using getters in case the defined languages change over time
|
|
55
63
|
private get metadataLang(): LanguageCode {
|
|
@@ -91,8 +99,8 @@ export class ElasticsearchService {
|
|
|
91
99
|
const addMapping = (fieldName: string) => {
|
|
92
100
|
if (!payload.runtime_mappings) payload.runtime_mappings = {}
|
|
93
101
|
payload.runtime_mappings[fieldName] = {
|
|
94
|
-
type:
|
|
95
|
-
script: this.runtimeFields[fieldName],
|
|
102
|
+
type: this.runtimeFields[fieldName].type,
|
|
103
|
+
script: this.runtimeFields[fieldName].script,
|
|
96
104
|
}
|
|
97
105
|
}
|
|
98
106
|
const lookForField = (node: unknown) => {
|
|
@@ -113,6 +121,14 @@ export class ElasticsearchService {
|
|
|
113
121
|
) {
|
|
114
122
|
addMapping(runtimeField)
|
|
115
123
|
}
|
|
124
|
+
if (
|
|
125
|
+
runtimeField in node &&
|
|
126
|
+
typeof node[runtimeField] === 'object' &&
|
|
127
|
+
node[runtimeField] !== null &&
|
|
128
|
+
('gte' in node[runtimeField] || 'lte' in node[runtimeField])
|
|
129
|
+
) {
|
|
130
|
+
addMapping(runtimeField)
|
|
131
|
+
}
|
|
116
132
|
if (
|
|
117
133
|
'query' in node &&
|
|
118
134
|
typeof node.query === 'string' &&
|
|
@@ -131,8 +147,12 @@ export class ElasticsearchService {
|
|
|
131
147
|
return payload
|
|
132
148
|
}
|
|
133
149
|
|
|
134
|
-
registerRuntimeField(
|
|
135
|
-
|
|
150
|
+
registerRuntimeField(
|
|
151
|
+
fieldName: string,
|
|
152
|
+
expression: string,
|
|
153
|
+
type: 'keyword' | 'date' = 'keyword'
|
|
154
|
+
) {
|
|
155
|
+
this.runtimeFields[fieldName] = { script: expression, type }
|
|
136
156
|
}
|
|
137
157
|
|
|
138
158
|
getMetadataByIdsPayload(uuids: string[]): EsSearchParams {
|
|
@@ -264,8 +284,18 @@ export class ElasticsearchService {
|
|
|
264
284
|
return this.metadataLang === 'current'
|
|
265
285
|
}
|
|
266
286
|
|
|
267
|
-
private
|
|
287
|
+
private findSpatialFilterExtent(
|
|
268
288
|
filters: FieldFilters | FiltersAggregationParams | string
|
|
289
|
+
): BoundingBox | undefined {
|
|
290
|
+
if (typeof filters === 'string') {
|
|
291
|
+
return undefined
|
|
292
|
+
}
|
|
293
|
+
return Object.values(filters).find(isBoundingBox)
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
private filtersToQuery(
|
|
297
|
+
filters: FieldFilters | FiltersAggregationParams | string,
|
|
298
|
+
spatialFilterExtent = this.findSpatialFilterExtent(filters)
|
|
269
299
|
): FilterQuery {
|
|
270
300
|
const addQuote = (key: string) => (/^\/.+\/$/.test(key) ? key : `"${key}"`)
|
|
271
301
|
const makeQuery = (filter: FieldFilter): string => {
|
|
@@ -286,7 +316,9 @@ export class ElasticsearchService {
|
|
|
286
316
|
? filters
|
|
287
317
|
: Object.keys(filters)
|
|
288
318
|
.filter((fieldname) => fieldname !== 'gn-ui-crossFieldFilter')
|
|
319
|
+
.filter((fieldname) => !isBoundingBox(filters[fieldname]))
|
|
289
320
|
.filter((fieldname) => !isDateRange(filters[fieldname]))
|
|
321
|
+
.filter((fieldname) => !Array.isArray(filters[fieldname]))
|
|
290
322
|
.filter(
|
|
291
323
|
(fieldname) =>
|
|
292
324
|
filters[fieldname] &&
|
|
@@ -299,37 +331,39 @@ export class ElasticsearchService {
|
|
|
299
331
|
if (filters['gn-ui-crossFieldFilter']) {
|
|
300
332
|
queryString = `${queryString} AND (${filters['gn-ui-crossFieldFilter']})`
|
|
301
333
|
}
|
|
302
|
-
const
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
return {
|
|
306
|
-
searchField,
|
|
307
|
-
dateRange,
|
|
308
|
-
} as {
|
|
309
|
-
searchField: string
|
|
310
|
-
dateRange: DateRange
|
|
311
|
-
}
|
|
312
|
-
})[0]
|
|
334
|
+
const queryRanges = Object.entries(filters).filter(([, value]) =>
|
|
335
|
+
isDateRange(value)
|
|
336
|
+
) as [string, DateRange][]
|
|
313
337
|
const queryParts = [
|
|
314
338
|
queryString && {
|
|
315
339
|
query_string: {
|
|
316
340
|
query: queryString,
|
|
317
341
|
},
|
|
318
342
|
},
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
343
|
+
...queryRanges.map(([searchField, dateRange]) => ({
|
|
344
|
+
range: {
|
|
345
|
+
[searchField]: {
|
|
346
|
+
...(dateRange.start && { gte: formatDate(dateRange.start) }),
|
|
347
|
+
...(dateRange.end && { lte: formatDate(dateRange.end) }),
|
|
348
|
+
format: 'yyyy-MM-dd',
|
|
349
|
+
},
|
|
350
|
+
},
|
|
351
|
+
})),
|
|
352
|
+
spatialFilterExtent && {
|
|
353
|
+
geo_shape: {
|
|
354
|
+
geom: {
|
|
355
|
+
shape: {
|
|
356
|
+
type: 'envelope',
|
|
357
|
+
// spatialFilterExtent is [minX, minY, maxX, maxY]; envelope coordinates are [top-left, bottom-right]
|
|
358
|
+
coordinates: [
|
|
359
|
+
[spatialFilterExtent[0], spatialFilterExtent[3]],
|
|
360
|
+
[spatialFilterExtent[2], spatialFilterExtent[1]],
|
|
361
|
+
],
|
|
330
362
|
},
|
|
363
|
+
relation: 'intersects',
|
|
331
364
|
},
|
|
332
365
|
},
|
|
366
|
+
},
|
|
333
367
|
].filter(Boolean)
|
|
334
368
|
return queryParts.length > 0 ? (queryParts as FilterQuery) : undefined
|
|
335
369
|
}
|
|
@@ -368,7 +402,12 @@ export class ElasticsearchService {
|
|
|
368
402
|
},
|
|
369
403
|
})
|
|
370
404
|
}
|
|
371
|
-
|
|
405
|
+
// a spatial extent filter takes precedence over the preference geometry for boosting
|
|
406
|
+
const spatialFilterExtent = this.findSpatialFilterExtent(fieldSearchFilters)
|
|
407
|
+
const queryFilters = this.filtersToQuery(
|
|
408
|
+
fieldSearchFilters,
|
|
409
|
+
spatialFilterExtent
|
|
410
|
+
)
|
|
372
411
|
if (queryFilters) {
|
|
373
412
|
filter.push(...queryFilters)
|
|
374
413
|
}
|
|
@@ -379,7 +418,10 @@ export class ElasticsearchService {
|
|
|
379
418
|
},
|
|
380
419
|
})
|
|
381
420
|
}
|
|
382
|
-
|
|
421
|
+
const boostGeometry = spatialFilterExtent
|
|
422
|
+
? bboxToPolygon(spatialFilterExtent)
|
|
423
|
+
: geometry
|
|
424
|
+
if (boostGeometry) {
|
|
383
425
|
// boosts applied using the filter geometry:
|
|
384
426
|
// * records completely within the geometry receive a boost of 5
|
|
385
427
|
// * records intersecting the geometry receive a boost of 2
|
|
@@ -389,7 +431,7 @@ export class ElasticsearchService {
|
|
|
389
431
|
{
|
|
390
432
|
geo_shape: {
|
|
391
433
|
geom: {
|
|
392
|
-
shape:
|
|
434
|
+
shape: boostGeometry,
|
|
393
435
|
relation: 'within',
|
|
394
436
|
},
|
|
395
437
|
boost: 5.0,
|
|
@@ -398,7 +440,7 @@ export class ElasticsearchService {
|
|
|
398
440
|
{
|
|
399
441
|
geo_shape: {
|
|
400
442
|
geom: {
|
|
401
|
-
shape:
|
|
443
|
+
shape: boostGeometry,
|
|
402
444
|
relation: 'intersects',
|
|
403
445
|
},
|
|
404
446
|
boost: 2.0,
|
|
@@ -409,7 +451,7 @@ export class ElasticsearchService {
|
|
|
409
451
|
// this will boost the results variably depending on their distance from the given geometry
|
|
410
452
|
// note: this takes into account the `location` field of a record; this is generally the center of all spatial extents
|
|
411
453
|
// combined, and thus the actual size/coverage of the record spatial extent isn't relevant here
|
|
412
|
-
const bbox = getGeometryBoundingBox(
|
|
454
|
+
const bbox = getGeometryBoundingBox(boostGeometry)
|
|
413
455
|
const center = [(bbox[0] + bbox[2]) / 2, (bbox[1] + bbox[3]) / 2]
|
|
414
456
|
const northToCenter = new LineString([
|
|
415
457
|
[center[0], bbox[3]],
|
|
@@ -6,11 +6,15 @@ export type FieldFilterByRange = {
|
|
|
6
6
|
start?: Date
|
|
7
7
|
end?: Date
|
|
8
8
|
}
|
|
9
|
+
// matches util/shared's BoundingBox; duplicated here to avoid a circular
|
|
10
|
+
// dependency (util/shared already depends on common/domain)
|
|
11
|
+
export type FieldFilterByBoundingBox = [number, number, number, number]
|
|
9
12
|
|
|
10
13
|
export type FieldFilter =
|
|
11
14
|
| FieldFilterByExpression
|
|
12
15
|
| FieldFilterByValues
|
|
13
16
|
| FieldFilterByRange
|
|
17
|
+
| FieldFilterByBoundingBox
|
|
14
18
|
export type FieldFilters = Record<FieldName, FieldFilter>
|
|
15
19
|
|
|
16
20
|
export type QueryString = {
|
|
@@ -19,4 +23,12 @@ export type QueryString = {
|
|
|
19
23
|
export type QueryRange = {
|
|
20
24
|
range: Record<string, { format: string; gte: string; lte: string }>
|
|
21
25
|
}
|
|
22
|
-
export type
|
|
26
|
+
export type QueryGeoShape = {
|
|
27
|
+
geo_shape: {
|
|
28
|
+
geom: {
|
|
29
|
+
shape: { type: string; coordinates: number[][] }
|
|
30
|
+
relation: string
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
export type FilterQuery = Array<QueryString | QueryRange | QueryGeoShape>
|
|
@@ -18,10 +18,12 @@ export class NotificationsService {
|
|
|
18
18
|
error && console.error(error)
|
|
19
19
|
const id = Math.floor(Math.random() * 1000000)
|
|
20
20
|
this.notifications$.next([...this.notifications$.value, { ...content, id }])
|
|
21
|
-
if (typeof timeoutMs
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
if (typeof timeoutMs !== 'undefined') {
|
|
22
|
+
setTimeout(() => {
|
|
23
|
+
this.removeNotificationById(id)
|
|
24
|
+
}, timeoutMs)
|
|
25
|
+
}
|
|
26
|
+
return id
|
|
25
27
|
}
|
|
26
28
|
|
|
27
29
|
removeNotificationById(id: number) {
|
|
@@ -22,7 +22,7 @@ export function flattenQueryParams(
|
|
|
22
22
|
const start = (flattened[key] as DateRange).start
|
|
23
23
|
const end = (flattened[key] as DateRange).end
|
|
24
24
|
flattened[key] = [
|
|
25
|
-
`${start ? formatDate(start) : ''}..${formatDate(end)
|
|
25
|
+
`${start ? formatDate(start) : ''}..${end ? formatDate(end) : ''}`,
|
|
26
26
|
]
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
@if (fieldType === 'dateRange') {
|
|
2
2
|
<gn-ui-date-range-dropdown
|
|
3
3
|
[title]="title"
|
|
4
|
-
[
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
(endDateChange)="onEndDateChange($event)"
|
|
4
|
+
[dateRange]="(selectedDateRange$ | async) ?? {}"
|
|
5
|
+
(dateRangeChange)="onDateRangeChange($event)"
|
|
6
|
+
[attr.data-cy-field]="fieldName"
|
|
8
7
|
></gn-ui-date-range-dropdown>
|
|
8
|
+
} @else if (fieldType === 'spatialExtent') {
|
|
9
|
+
<gn-ui-spatial-extent-dropdown
|
|
10
|
+
[title]="title"
|
|
11
|
+
[initialBbox]="(selectedBoundingBox$ | async) ?? null"
|
|
12
|
+
[maxFileSizeMb]="spatialExtentMaxFileSize"
|
|
13
|
+
(bboxChange)="onBboxChange($event)"
|
|
14
|
+
(errorChange)="onSpatialExtentError($event)"
|
|
15
|
+
[attr.data-cy-field]="fieldName"
|
|
16
|
+
></gn-ui-spatial-extent-dropdown>
|
|
9
17
|
} @else {
|
|
10
18
|
<gn-ui-dropdown-multiselect
|
|
11
19
|
class="w-full"
|
|
@@ -9,6 +9,8 @@ import {
|
|
|
9
9
|
Choice,
|
|
10
10
|
DateRangeDropdownComponent,
|
|
11
11
|
DropdownMultiselectComponent,
|
|
12
|
+
SpatialExtentDropdownComponent,
|
|
13
|
+
SpatialExtentDropdownError,
|
|
12
14
|
} from '../../../../../../libs/ui/inputs/src'
|
|
13
15
|
import { Observable, of, switchMap } from 'rxjs'
|
|
14
16
|
import { catchError, filter, map, startWith } from 'rxjs/operators'
|
|
@@ -22,6 +24,10 @@ import {
|
|
|
22
24
|
} from '../utils/service/fields'
|
|
23
25
|
import { DateRange } from '../../../../../../libs/api/repository/src'
|
|
24
26
|
import { CommonModule } from '@angular/common'
|
|
27
|
+
import { BoundingBox } from '../../../../../../libs/util/shared/src'
|
|
28
|
+
import { NotificationsService } from '../../../../../../libs/feature/notifications/src'
|
|
29
|
+
import { TranslateService } from '@ngx-translate/core'
|
|
30
|
+
import { getOptionalSearchConfig } from '../../../../../../libs/util/app-config/src'
|
|
25
31
|
|
|
26
32
|
@Component({
|
|
27
33
|
selector: 'gn-ui-filter-dropdown',
|
|
@@ -33,18 +39,23 @@ import { CommonModule } from '@angular/common'
|
|
|
33
39
|
CommonModule,
|
|
34
40
|
DateRangeDropdownComponent,
|
|
35
41
|
DropdownMultiselectComponent,
|
|
42
|
+
SpatialExtentDropdownComponent,
|
|
36
43
|
],
|
|
37
44
|
})
|
|
38
45
|
export class FilterDropdownComponent implements OnInit {
|
|
39
46
|
private searchFacade = inject(SearchFacade)
|
|
40
47
|
private searchService = inject(SearchService)
|
|
41
48
|
private fieldsService = inject(FieldsService)
|
|
49
|
+
private notificationsService = inject(NotificationsService)
|
|
50
|
+
private translateService = inject(TranslateService)
|
|
42
51
|
|
|
43
52
|
@Input() fieldName: string
|
|
44
53
|
@Input() title: string
|
|
45
54
|
|
|
55
|
+
spatialExtentMaxFileSize =
|
|
56
|
+
getOptionalSearchConfig()?.SPATIAL_EXTENT_MAX_FILE_SIZE
|
|
57
|
+
|
|
46
58
|
fieldType: FieldType
|
|
47
|
-
dateRange: DateRange
|
|
48
59
|
choices$: Observable<Choice[]>
|
|
49
60
|
selected$ = this.searchFacade.searchFilters$.pipe(
|
|
50
61
|
switchMap((filters) =>
|
|
@@ -57,15 +68,54 @@ export class FilterDropdownComponent implements OnInit {
|
|
|
57
68
|
) as Observable<FieldValue[]>
|
|
58
69
|
|
|
59
70
|
selectedDateRange$ = this.selected$.pipe(
|
|
60
|
-
map((
|
|
71
|
+
map((selected) => (Array.isArray(selected) ? {} : (selected as DateRange)))
|
|
61
72
|
) as Observable<DateRange>
|
|
62
73
|
|
|
74
|
+
selectedBoundingBox$ = this.selected$.pipe(
|
|
75
|
+
map((selected) =>
|
|
76
|
+
Array.isArray(selected) && selected.length > 0
|
|
77
|
+
? (selected as BoundingBox)
|
|
78
|
+
: null
|
|
79
|
+
)
|
|
80
|
+
) as Observable<BoundingBox | null>
|
|
81
|
+
|
|
63
82
|
onSelectedValues(values: unknown[]) {
|
|
64
83
|
this.fieldsService
|
|
65
84
|
.buildFiltersFromFieldValues({ [this.fieldName]: values as FieldValue[] })
|
|
66
85
|
.subscribe((filters) => this.searchService.updateFilters(filters))
|
|
67
86
|
}
|
|
68
87
|
|
|
88
|
+
private spatialExtentErrorNotificationId: number | null = null
|
|
89
|
+
|
|
90
|
+
onBboxChange(bbox: BoundingBox | null) {
|
|
91
|
+
this.fieldsService
|
|
92
|
+
.buildFiltersFromFieldValues({
|
|
93
|
+
[this.fieldName]: bbox,
|
|
94
|
+
})
|
|
95
|
+
.subscribe((filters) => this.searchService.updateFilters(filters))
|
|
96
|
+
this.clearSpatialExtentErrorNotification()
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
onSpatialExtentError(error: SpatialExtentDropdownError) {
|
|
100
|
+
this.clearSpatialExtentErrorNotification()
|
|
101
|
+
this.spatialExtentErrorNotificationId =
|
|
102
|
+
this.notificationsService.showNotification({
|
|
103
|
+
type: 'error',
|
|
104
|
+
title: this.translateService.instant(
|
|
105
|
+
'search.filters.spatialExtent.error.title'
|
|
106
|
+
),
|
|
107
|
+
text: this.translateService.instant(error.key, error.params),
|
|
108
|
+
})
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
private clearSpatialExtentErrorNotification() {
|
|
112
|
+
if (this.spatialExtentErrorNotificationId === null) return
|
|
113
|
+
this.notificationsService.removeNotificationById(
|
|
114
|
+
this.spatialExtentErrorNotificationId
|
|
115
|
+
)
|
|
116
|
+
this.spatialExtentErrorNotificationId = null
|
|
117
|
+
}
|
|
118
|
+
|
|
69
119
|
ngOnInit() {
|
|
70
120
|
this.fieldType = this.fieldsService.getFieldType(this.fieldName)
|
|
71
121
|
this.choices$ = this.fieldsService.getAvailableValues(this.fieldName).pipe(
|
|
@@ -80,22 +130,11 @@ export class FilterDropdownComponent implements OnInit {
|
|
|
80
130
|
)
|
|
81
131
|
}
|
|
82
132
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
if (!end) return
|
|
90
|
-
this.dateRange = { ...this.dateRange, end }
|
|
91
|
-
if (this.dateRange.start && this.dateRange.end) {
|
|
92
|
-
this.fieldsService
|
|
93
|
-
.buildFiltersFromFieldValues({
|
|
94
|
-
[this.fieldName]: this.dateRange,
|
|
95
|
-
})
|
|
96
|
-
.subscribe((filters) => {
|
|
97
|
-
return this.searchService.updateFilters(filters)
|
|
98
|
-
})
|
|
99
|
-
}
|
|
133
|
+
onDateRangeChange(dateRange: DateRange) {
|
|
134
|
+
this.fieldsService
|
|
135
|
+
.buildFiltersFromFieldValues({
|
|
136
|
+
[this.fieldName]: dateRange,
|
|
137
|
+
})
|
|
138
|
+
.subscribe((filters) => this.searchService.updateFilters(filters))
|
|
100
139
|
}
|
|
101
140
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Component, Input, OnInit, inject } from '@angular/core'
|
|
2
|
-
import { CommonModule
|
|
2
|
+
import { CommonModule } from '@angular/common'
|
|
3
3
|
import {
|
|
4
4
|
catchError,
|
|
5
5
|
firstValueFrom,
|
|
@@ -15,11 +15,14 @@ import { FieldType, FieldValue } from '../utils/service/fields'
|
|
|
15
15
|
import { SearchFacade } from '../state/search.facade'
|
|
16
16
|
import { SearchService } from '../utils/service/search.service'
|
|
17
17
|
import { FieldsService } from '../utils/service/fields.service'
|
|
18
|
-
import { formatUserInfo } from '../../../../../../libs/util/shared/src'
|
|
18
|
+
import { DateService, formatUserInfo } from '../../../../../../libs/util/shared/src'
|
|
19
19
|
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
|
|
20
20
|
|
|
21
21
|
marker('search.filters.summaryLabel.user')
|
|
22
22
|
marker('search.filters.summaryLabel.changeDate')
|
|
23
|
+
marker('search.filters.summaryLabel.resourceCreationRevisionDate')
|
|
24
|
+
|
|
25
|
+
const OPEN_BOUND = '…'
|
|
23
26
|
|
|
24
27
|
interface DisplayedValue {
|
|
25
28
|
label: string
|
|
@@ -32,13 +35,12 @@ interface DisplayedValue {
|
|
|
32
35
|
imports: [CommonModule, BadgeComponent],
|
|
33
36
|
templateUrl: './search-filters-summary-item.component.html',
|
|
34
37
|
styleUrls: ['./search-filters-summary-item.component.css'],
|
|
35
|
-
providers: [DatePipe],
|
|
36
38
|
})
|
|
37
39
|
export class SearchFiltersSummaryItemComponent implements OnInit {
|
|
38
40
|
private searchFacade = inject(SearchFacade)
|
|
39
41
|
private searchService = inject(SearchService)
|
|
40
42
|
private fieldsService = inject(FieldsService)
|
|
41
|
-
private
|
|
43
|
+
private dateService = inject(DateService)
|
|
42
44
|
private translate = inject(TranslateService)
|
|
43
45
|
|
|
44
46
|
@Input() fieldName: string
|
|
@@ -82,12 +84,10 @@ export class SearchFiltersSummaryItemComponent implements OnInit {
|
|
|
82
84
|
getReadableValues(fieldValues: FieldValue[] | DateRange[]): DisplayedValue[] {
|
|
83
85
|
return fieldValues.map((value) => {
|
|
84
86
|
if (this.fieldType === 'dateRange') {
|
|
87
|
+
const { start, end } = value as DateRange
|
|
85
88
|
return {
|
|
86
89
|
value,
|
|
87
|
-
label: `${this.
|
|
88
|
-
value.start,
|
|
89
|
-
'dd.MM.yyyy'
|
|
90
|
-
)} - ${this.datePipe.transform(value.end, 'dd.MM.yyyy')}`,
|
|
90
|
+
label: `${this.formatBound(start)} - ${this.formatBound(end)}`,
|
|
91
91
|
}
|
|
92
92
|
} else if (this.fieldName === 'user') {
|
|
93
93
|
return { value, label: formatUserInfo(value) }
|
|
@@ -97,6 +97,16 @@ export class SearchFiltersSummaryItemComponent implements OnInit {
|
|
|
97
97
|
})
|
|
98
98
|
}
|
|
99
99
|
|
|
100
|
+
private formatBound(date: Date | undefined): string {
|
|
101
|
+
return date
|
|
102
|
+
? this.dateService.formatDate(date, {
|
|
103
|
+
day: '2-digit',
|
|
104
|
+
month: '2-digit',
|
|
105
|
+
year: 'numeric',
|
|
106
|
+
})
|
|
107
|
+
: OPEN_BOUND
|
|
108
|
+
}
|
|
109
|
+
|
|
100
110
|
async removeFilterValue(fieldValue: FieldValue | DateRange) {
|
|
101
111
|
const currentFieldValues: DisplayedValue[] = await firstValueFrom(
|
|
102
112
|
this.fieldValues$
|
|
@@ -2,6 +2,7 @@ import { Injectable, Injector, inject } from '@angular/core'
|
|
|
2
2
|
import {
|
|
3
3
|
AbstractSearchField,
|
|
4
4
|
AvailableServicesField,
|
|
5
|
+
BoundingBoxSearchField,
|
|
5
6
|
DateRangeSearchField,
|
|
6
7
|
FieldValue,
|
|
7
8
|
FullTextSearchField,
|
|
@@ -10,6 +11,7 @@ import {
|
|
|
10
11
|
MultilingualSearchField,
|
|
11
12
|
OrganizationSearchField,
|
|
12
13
|
OwnerSearchField,
|
|
14
|
+
ResourceCreationRevisionDateSearchField,
|
|
13
15
|
ResourceTypeLegacyField,
|
|
14
16
|
SimpleSearchField,
|
|
15
17
|
TranslatedSearchField,
|
|
@@ -42,7 +44,8 @@ marker('search.filters.producerOrg')
|
|
|
42
44
|
marker('search.filters.publisherOrg')
|
|
43
45
|
marker('search.filters.user')
|
|
44
46
|
marker('search.filters.changeDate')
|
|
45
|
-
|
|
47
|
+
marker('search.filters.resourceCreationRevisionDate')
|
|
48
|
+
marker('search.filters.spatialExtent')
|
|
46
49
|
@Injectable({
|
|
47
50
|
providedIn: 'root',
|
|
48
51
|
})
|
|
@@ -94,7 +97,12 @@ export class FieldsService {
|
|
|
94
97
|
),
|
|
95
98
|
user: new UserSearchField(this.injector),
|
|
96
99
|
changeDate: new DateRangeSearchField('changeDate', this.injector, 'desc'),
|
|
100
|
+
resourceCreationRevisionDate: new ResourceCreationRevisionDateSearchField(
|
|
101
|
+
this.injector,
|
|
102
|
+
'desc'
|
|
103
|
+
),
|
|
97
104
|
availableServices: new AvailableServicesField(this.injector),
|
|
105
|
+
spatialExtent: new BoundingBoxSearchField('spatialExtent', this.injector),
|
|
98
106
|
} as Record<string, AbstractSearchField>
|
|
99
107
|
|
|
100
108
|
get supportedFields() {
|
|
@@ -20,10 +20,14 @@ import {
|
|
|
20
20
|
isDateRange,
|
|
21
21
|
METADATA_LANGUAGE,
|
|
22
22
|
} from '../../../../../../../libs/api/repository/src'
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
BoundingBox,
|
|
25
|
+
formatUserInfo,
|
|
26
|
+
isBoundingBox,
|
|
27
|
+
} from '../../../../../../../libs/util/shared/src'
|
|
24
28
|
import { PossibleResourceTypes } from '../../../../../../../libs/api/metadata-converter/src'
|
|
25
29
|
|
|
26
|
-
export type FieldType = 'values' | 'dateRange'
|
|
30
|
+
export type FieldType = 'values' | 'dateRange' | 'spatialExtent'
|
|
27
31
|
|
|
28
32
|
export type FieldValue = string | number
|
|
29
33
|
export interface FieldAvailableValue {
|
|
@@ -431,6 +435,43 @@ export class DateRangeSearchField extends SimpleSearchField {
|
|
|
431
435
|
}
|
|
432
436
|
}
|
|
433
437
|
|
|
438
|
+
export class ResourceCreationRevisionDateSearchField extends DateRangeSearchField {
|
|
439
|
+
constructor(injector: Injector, order: 'asc' | 'desc' = 'desc') {
|
|
440
|
+
super('resourceCreationRevisionDate', injector, order)
|
|
441
|
+
this.esService.registerRuntimeField(
|
|
442
|
+
'resourceCreationRevisionDate',
|
|
443
|
+
`if (doc.containsKey('creationDateForResource') && doc['creationDateForResource'].size() > 0) {
|
|
444
|
+
for (def date : doc['creationDateForResource']) { emit(date.millis); }
|
|
445
|
+
}
|
|
446
|
+
if (doc.containsKey('revisionDateForResource') && doc['revisionDateForResource'].size() > 0) {
|
|
447
|
+
for (def date : doc['revisionDateForResource']) { emit(date.millis); }
|
|
448
|
+
}`,
|
|
449
|
+
'date'
|
|
450
|
+
)
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
export class BoundingBoxSearchField extends SimpleSearchField {
|
|
455
|
+
getAvailableValues(): Observable<FieldAvailableValue[]> {
|
|
456
|
+
return of([])
|
|
457
|
+
}
|
|
458
|
+
|
|
459
|
+
getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
|
|
460
|
+
return of({
|
|
461
|
+
[this.esFieldName]: values.map(Number) as BoundingBox,
|
|
462
|
+
})
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
|
|
466
|
+
const filter = filters[this.esFieldName]
|
|
467
|
+
return of(isBoundingBox(filter) ? filter : [])
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
getType(): FieldType {
|
|
471
|
+
return 'spatialExtent'
|
|
472
|
+
}
|
|
473
|
+
}
|
|
474
|
+
|
|
434
475
|
marker('search.filters.availableServices.view')
|
|
435
476
|
marker('search.filters.availableServices.download')
|
|
436
477
|
|
|
@@ -4,6 +4,7 @@ export * from './lib/button/button.component'
|
|
|
4
4
|
export * from './lib/check-toggle/check-toggle.component'
|
|
5
5
|
export * from './lib/checkbox/checkbox.component'
|
|
6
6
|
export * from './lib/copy-text-button/copy-text-button.component'
|
|
7
|
+
export * from './lib/date-adapter.providers'
|
|
7
8
|
export * from './lib/date-picker/date-picker.component'
|
|
8
9
|
export * from './lib/date-range-dropdown/date-range-dropdown.component'
|
|
9
10
|
export * from './lib/date-range-picker/date-range-picker.component'
|
|
@@ -25,3 +26,4 @@ export * from './lib/url-input/url-input.component'
|
|
|
25
26
|
export * from './lib/viewport-intersector/viewport-intersector.component'
|
|
26
27
|
export * from './lib/search-feature-catalog/search-feature-catalog.component'
|
|
27
28
|
export * from './lib/date-range-inputs/date-range-inputs.component'
|
|
29
|
+
export * from './lib/spatial-extent-dropdown/spatial-extent-dropdown.component'
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { inject, Provider } from '@angular/core'
|
|
2
|
+
import {
|
|
3
|
+
DateAdapter,
|
|
4
|
+
MAT_DATE_FORMATS,
|
|
5
|
+
MAT_DATE_LOCALE,
|
|
6
|
+
} from '@angular/material/core'
|
|
7
|
+
import {
|
|
8
|
+
DateFnsAdapter,
|
|
9
|
+
MAT_DATE_FNS_FORMATS,
|
|
10
|
+
} from '@angular/material-date-fns-adapter'
|
|
11
|
+
import { enUS } from 'date-fns/locale/en-US'
|
|
12
|
+
import { DateService } from '../../../../../libs/util/shared/src'
|
|
13
|
+
|
|
14
|
+
export function provideLocalizedDateAdapter(): Provider[] {
|
|
15
|
+
return [
|
|
16
|
+
{ provide: MAT_DATE_LOCALE, useValue: enUS },
|
|
17
|
+
{ provide: MAT_DATE_FORMATS, useValue: MAT_DATE_FNS_FORMATS },
|
|
18
|
+
{
|
|
19
|
+
provide: DateAdapter,
|
|
20
|
+
useFactory: () => {
|
|
21
|
+
const dateService = inject(DateService)
|
|
22
|
+
const adapter = new DateFnsAdapter()
|
|
23
|
+
dateService
|
|
24
|
+
.getDateFnsLocale()
|
|
25
|
+
.then((locale) => adapter.setLocale(locale))
|
|
26
|
+
return adapter
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
]
|
|
30
|
+
}
|