geonetwork-ui 2.10.0-dev.300bb3d2d → 2.10.0-dev.37a1e4c4d
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 +796 -5789
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/index.d.ts +191 -84
- package/index.d.ts.map +1 -1
- package/material-styles.css +483 -0
- package/package.json +25 -35
- package/src/libs/api/metadata-converter/src/lib/dcat-ap/dcat-ap.converter.ts +9 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/eu.dcat-ap.records.ts +2 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.reuse+ongules.ts +7 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.reuse+roilaye.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/georhena.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/metadata-for-i18n.records.ts +2 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/metawal.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/opendataswiss.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/sextant.records.ts +2 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/vlaanderen.dcat-ap.records.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.reuse.ts +8 -0
- package/src/libs/api/metadata-converter/src/lib/gn4/gn4.converter.ts +1 -0
- package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +2 -2
- package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts +2 -2
- package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts +7 -0
- package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts +8 -0
- package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts +8 -0
- package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts +11 -0
- package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts +33 -0
- package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts +33 -0
- package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts +8 -4
- package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +2 -2
- package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +54 -32
- package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts +1 -1
- package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts +1 -1
- package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +48 -2
- package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +11 -5
- package/src/libs/common/domain/src/lib/model/user/group.model.ts +8 -0
- package/src/libs/common/domain/src/lib/model/user/index.ts +1 -0
- package/src/libs/common/domain/src/lib/platform.service.interface.ts +2 -0
- package/src/libs/common/fixtures/src/lib/records.fixtures.ts +5 -0
- package/src/libs/feature/catalog/src/lib/sources/sources.service.ts +5 -2
- package/src/libs/feature/editor/src/lib/+state/editor.actions.ts +6 -0
- package/src/libs/feature/editor/src/lib/+state/editor.facade.ts +10 -1
- package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts +0 -2
- package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.css +0 -0
- package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.html +67 -0
- package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.ts +39 -0
- package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.html +18 -3
- package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.ts +33 -40
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/field-focus.directive.ts +41 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-constraints-shortcuts/form-field-constraints-shortcuts.component.ts +32 -34
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts/form-field-contacts.component.html +13 -13
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts/form-field-contacts.component.ts +18 -4
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.html +8 -7
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.ts +6 -6
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-single-link-resource/form-field-online-single-link-resource.component.css +0 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-single-link-resource/form-field-online-single-link-resource.component.html +5 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-single-link-resource/form-field-online-single-link-resource.component.ts +89 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-topics/form-field-topics.component.ts +2 -2
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.css +3 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html +1 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts +5 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/index.ts +1 -0
- package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.css +35 -0
- package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.html +5 -1
- package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts +77 -5
- package/src/libs/feature/editor/src/lib/fields.config.ts +60 -47
- package/src/libs/feature/editor/src/lib/models/editor-config.model.ts +4 -0
- package/src/libs/feature/editor/src/lib/services/editor.service.ts +1 -1
- package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +33 -0
- package/src/libs/feature/notify-reuse/src/index.ts +1 -0
- package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.css +0 -0
- package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.html +1 -0
- package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts +21 -0
- package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +9 -1
- package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts +2 -2
- package/src/libs/ui/dataviz/src/index.ts +0 -1
- package/src/libs/ui/elements/src/index.ts +2 -0
- package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.html +96 -0
- package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.ts +45 -0
- package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.html +41 -0
- package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.ts +70 -0
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.css +13 -0
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html +13 -3
- package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.ts +43 -6
- package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts +2 -2
- package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts +2 -5
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css +0 -4
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +28 -67
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +30 -10
- package/src/libs/ui/inputs/src/lib/button/button.component.ts +8 -0
- package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts +2 -2
- package/src/libs/ui/inputs/src/lib/url-input/url-input.component.html +2 -2
- package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts +2 -1
- package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts +2 -1
- package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts +15 -64
- package/src/libs/ui/map/src/lib/map-utils.ts +48 -0
- package/src/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.ts +1 -1
- package/src/libs/util/app-config/src/lib/app-config.ts +70 -9
- package/src/libs/util/app-config/src/lib/model.ts +7 -0
- package/src/libs/util/app-config/src/lib/parse-utils.ts +50 -1
- package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts +1 -2
- package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts +6 -3
- package/src/libs/util/i18n/src/index.ts +0 -1
- package/src/libs/util/i18n/src/lib/i18n.constants.ts +17 -11
- package/src/libs/util/i18n/src/lib/i18n.interceptor.ts +2 -2
- package/src/libs/util/i18n/src/lib/i18n.providers.ts +14 -17
- package/src/libs/util/i18n/src/lib/test.translate.loader.ts +48 -0
- package/src/libs/util/shared/src/lib/links/link-utils.ts +1 -1
- package/src/libs/util/shared/src/lib/record/quality-score.util.ts +33 -18
- package/src/libs/util/shared/src/lib/services/date.service.ts +3 -3
- package/src/libs/util/shared/src/lib/utils/geojson.ts +58 -1
- package/src/libs/util/shared/src/lib/utils/index.ts +1 -0
- package/src/libs/util/shared/src/lib/utils/user-display.ts +32 -0
- package/style.css +0 -1
- package/tailwind.base.css +19 -2
- package/translations/de.json +29 -20
- package/translations/en.json +29 -20
- package/translations/es.json +29 -20
- package/translations/fr.json +29 -20
- package/translations/it.json +29 -20
- package/translations/nl.json +29 -20
- package/translations/pt.json +29 -20
- package/translations/sk.json +29 -20
|
@@ -28,9 +28,15 @@ import { UserModel } from '../../../../../../../../../libs/common/domain/src/lib
|
|
|
28
28
|
import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
29
29
|
import { OrganizationsServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/organizations.service.interface'
|
|
30
30
|
import { ContactCardComponent } from '../../../contact-card/contact-card.component'
|
|
31
|
-
import {
|
|
31
|
+
import { ContactDetailsFormComponent } from '../../../contact-details/contact-details-form.component'
|
|
32
|
+
import {
|
|
33
|
+
createFuzzyFilter,
|
|
34
|
+
getIndividualDisplayName,
|
|
35
|
+
toIndividual,
|
|
36
|
+
} from '../../../../../../../../../libs/util/shared/src'
|
|
32
37
|
import { map } from 'rxjs/operators'
|
|
33
38
|
import { SortableListComponent } from '../../../../../../../../../libs/ui/layout/src'
|
|
39
|
+
import { FieldModelSpecifier } from '../../../../models/editor-config.model'
|
|
34
40
|
|
|
35
41
|
@Component({
|
|
36
42
|
selector: 'gn-ui-form-field-contacts',
|
|
@@ -43,6 +49,7 @@ import { SortableListComponent } from '../../../../../../../../../libs/ui/layout
|
|
|
43
49
|
TranslateDirective,
|
|
44
50
|
TranslatePipe,
|
|
45
51
|
ContactCardComponent,
|
|
52
|
+
ContactDetailsFormComponent,
|
|
46
53
|
SortableListComponent,
|
|
47
54
|
],
|
|
48
55
|
})
|
|
@@ -52,6 +59,7 @@ export class FormFieldContactsComponent implements OnDestroy, OnChanges {
|
|
|
52
59
|
private changeDetectorRef = inject(ChangeDetectorRef)
|
|
53
60
|
|
|
54
61
|
@Input() value: Individual[]
|
|
62
|
+
@Input() modelSpecifier: FieldModelSpecifier
|
|
55
63
|
@Output() valueChange: EventEmitter<Individual[]> = new EventEmitter()
|
|
56
64
|
|
|
57
65
|
contacts: Individual[] = []
|
|
@@ -113,13 +121,19 @@ export class FormFieldContactsComponent implements OnDestroy, OnChanges {
|
|
|
113
121
|
this.valueChange.emit(contacts)
|
|
114
122
|
}
|
|
115
123
|
|
|
124
|
+
handleContactChanged(updatedContact: Individual, index: number) {
|
|
125
|
+
const contacts = this.contacts.map((contact, i) =>
|
|
126
|
+
i === index ? updatedContact : contact
|
|
127
|
+
)
|
|
128
|
+
|
|
129
|
+
this.handleContactsChanged(contacts)
|
|
130
|
+
}
|
|
131
|
+
|
|
116
132
|
/**
|
|
117
133
|
* gn-ui-autocomplete
|
|
118
134
|
*/
|
|
119
135
|
displayWithFn: (user: UserModel) => string = (user) =>
|
|
120
|
-
|
|
121
|
-
user.organisation ? `(${user.organisation})` : ''
|
|
122
|
-
}`
|
|
136
|
+
getIndividualDisplayName(toIndividual(user))
|
|
123
137
|
|
|
124
138
|
/**
|
|
125
139
|
* gn-ui-autocomplete
|
|
@@ -8,6 +8,14 @@
|
|
|
8
8
|
</gn-ui-button>
|
|
9
9
|
}
|
|
10
10
|
</div>
|
|
11
|
+
@if (value.length === 0) {
|
|
12
|
+
<div
|
|
13
|
+
class="p-4 border border-primary bg-primary-lightest rounded-lg"
|
|
14
|
+
translate
|
|
15
|
+
>
|
|
16
|
+
editor.record.form.field.contactsForResource.noContact
|
|
17
|
+
</div>
|
|
18
|
+
}
|
|
11
19
|
@if (roleSectionsToDisplay && roleSectionsToDisplay.length > 0) {
|
|
12
20
|
<div class="mt-8" data-test="displayedRoles">
|
|
13
21
|
@for (
|
|
@@ -53,12 +61,5 @@
|
|
|
53
61
|
</div>
|
|
54
62
|
}
|
|
55
63
|
</div>
|
|
56
|
-
} @else {
|
|
57
|
-
<div
|
|
58
|
-
class="p-4 border border-primary bg-primary-lightest rounded-lg"
|
|
59
|
-
translate
|
|
60
|
-
>
|
|
61
|
-
editor.record.form.field.contactsForResource.noContact
|
|
62
|
-
</div>
|
|
63
64
|
}
|
|
64
65
|
</div>
|
|
@@ -23,7 +23,11 @@ import {
|
|
|
23
23
|
AutocompleteComponent,
|
|
24
24
|
ButtonComponent,
|
|
25
25
|
} from '../../../../../../../../../libs/ui/inputs/src'
|
|
26
|
-
import {
|
|
26
|
+
import {
|
|
27
|
+
createFuzzyFilter,
|
|
28
|
+
getIndividualDisplayName,
|
|
29
|
+
toIndividual,
|
|
30
|
+
} from '../../../../../../../../../libs/util/shared/src'
|
|
27
31
|
import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
|
|
28
32
|
import {
|
|
29
33
|
debounceTime,
|
|
@@ -169,11 +173,7 @@ export class FormFieldContactsForResourceComponent
|
|
|
169
173
|
* gn-ui-autocomplete
|
|
170
174
|
*/
|
|
171
175
|
displayWithFn: (user: UserModel) => string = (user) =>
|
|
172
|
-
user
|
|
173
|
-
? `${user.name} ${user.surname} ${
|
|
174
|
-
user.organisation ? `(${user.organisation})` : ''
|
|
175
|
-
}`
|
|
176
|
-
: ``
|
|
176
|
+
getIndividualDisplayName(toIndividual(user))
|
|
177
177
|
|
|
178
178
|
/**
|
|
179
179
|
* gn-ui-autocomplete
|
|
File without changes
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import {
|
|
2
|
+
ChangeDetectionStrategy,
|
|
3
|
+
Component,
|
|
4
|
+
EventEmitter,
|
|
5
|
+
Input,
|
|
6
|
+
Output,
|
|
7
|
+
inject,
|
|
8
|
+
} from '@angular/core'
|
|
9
|
+
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
|
|
10
|
+
import {
|
|
11
|
+
OnlineLinkResource,
|
|
12
|
+
OnlineResource,
|
|
13
|
+
} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
|
|
14
|
+
import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
|
|
15
|
+
import { UrlInputComponent } from '../../../../../../../../../libs/ui/inputs/src'
|
|
16
|
+
import { TranslateService } from '@ngx-translate/core'
|
|
17
|
+
|
|
18
|
+
marker('editor.record.form.field.onlineLinkageResource.defaultName')
|
|
19
|
+
|
|
20
|
+
@Component({
|
|
21
|
+
selector: 'gn-ui-form-field-online-single-link-resource',
|
|
22
|
+
templateUrl: './form-field-online-single-link-resource.component.html',
|
|
23
|
+
styleUrls: ['./form-field-online-single-link-resource.component.css'],
|
|
24
|
+
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
25
|
+
standalone: true,
|
|
26
|
+
imports: [UrlInputComponent],
|
|
27
|
+
})
|
|
28
|
+
export class FormFieldOnlineSingleLinkResourceComponent {
|
|
29
|
+
private notificationsService = inject(NotificationsService)
|
|
30
|
+
private translateService = inject(TranslateService)
|
|
31
|
+
|
|
32
|
+
@Input() set value(onlineResources: Array<OnlineResource>) {
|
|
33
|
+
this.allResources = onlineResources ?? []
|
|
34
|
+
const firstResource = this.allResources[0]
|
|
35
|
+
this.displayUrl = firstResource?.url?.toString() ?? ''
|
|
36
|
+
}
|
|
37
|
+
@Output() valueChange: EventEmitter<Array<OnlineResource>> =
|
|
38
|
+
new EventEmitter()
|
|
39
|
+
|
|
40
|
+
private allResources: OnlineResource[] = []
|
|
41
|
+
displayUrl = ''
|
|
42
|
+
|
|
43
|
+
handleUrlChange(url: string | null) {
|
|
44
|
+
if (!url) return
|
|
45
|
+
|
|
46
|
+
try {
|
|
47
|
+
const parsedUrl = new URL(url)
|
|
48
|
+
|
|
49
|
+
if (this.allResources.length === 0) {
|
|
50
|
+
const defaultName = this.translateService.instant(
|
|
51
|
+
'editor.record.form.field.onlineLinkageResource.defaultName'
|
|
52
|
+
)
|
|
53
|
+
const newResource: OnlineLinkResource = {
|
|
54
|
+
type: 'link',
|
|
55
|
+
url: parsedUrl,
|
|
56
|
+
name: defaultName,
|
|
57
|
+
}
|
|
58
|
+
this.valueChange.emit([newResource])
|
|
59
|
+
} else {
|
|
60
|
+
const updatedFirst: OnlineResource = {
|
|
61
|
+
...this.allResources[0],
|
|
62
|
+
url: parsedUrl,
|
|
63
|
+
}
|
|
64
|
+
this.valueChange.emit([updatedFirst, ...this.allResources.slice(1)])
|
|
65
|
+
}
|
|
66
|
+
} catch (error) {
|
|
67
|
+
this.handleError(error as Error)
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
private handleError(error: Error) {
|
|
72
|
+
this.notificationsService.showNotification(
|
|
73
|
+
{
|
|
74
|
+
type: 'error',
|
|
75
|
+
title: this.translateService.instant(
|
|
76
|
+
'editor.record.onlineResourceError.title'
|
|
77
|
+
),
|
|
78
|
+
text: `${this.translateService.instant(
|
|
79
|
+
'editor.record.onlineResourceError.body'
|
|
80
|
+
)} ${error.message}`,
|
|
81
|
+
closeMessage: this.translateService.instant(
|
|
82
|
+
'editor.record.onlineResourceError.closeMessage'
|
|
83
|
+
),
|
|
84
|
+
},
|
|
85
|
+
undefined,
|
|
86
|
+
error
|
|
87
|
+
)
|
|
88
|
+
}
|
|
89
|
+
}
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
DropdownMultiselectComponent,
|
|
6
6
|
} from '../../../../../../../../../libs/ui/inputs/src'
|
|
7
7
|
import { TranslatePipe, TranslateService } from '@ngx-translate/core'
|
|
8
|
-
import {
|
|
8
|
+
import { ISO_TOPICS } from '../../../../fields.config'
|
|
9
9
|
|
|
10
10
|
@Component({
|
|
11
11
|
selector: 'gn-ui-form-field-topics',
|
|
@@ -22,7 +22,7 @@ export class FormFieldTopicsComponent {
|
|
|
22
22
|
this.topics = topics
|
|
23
23
|
}
|
|
24
24
|
@Output() valueChange: EventEmitter<string[]> = new EventEmitter()
|
|
25
|
-
availableTopics =
|
|
25
|
+
availableTopics = ISO_TOPICS.map((topic) => {
|
|
26
26
|
return {
|
|
27
27
|
label: this.translateService.instant(topic.label),
|
|
28
28
|
value: topic.value,
|
package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts
CHANGED
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
Component,
|
|
5
5
|
ElementRef,
|
|
6
6
|
EventEmitter,
|
|
7
|
+
inject,
|
|
7
8
|
Input,
|
|
8
9
|
Output,
|
|
9
10
|
ViewChild,
|
|
@@ -22,6 +23,7 @@ import {
|
|
|
22
23
|
import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
|
|
23
24
|
import { TranslatePipe } from '@ngx-translate/core'
|
|
24
25
|
import {
|
|
26
|
+
FieldFocusDirective,
|
|
25
27
|
FormFieldDateComponent,
|
|
26
28
|
FormFieldLicenseComponent,
|
|
27
29
|
FormFieldTemporalExtentsComponent,
|
|
@@ -77,6 +79,7 @@ import { FormFieldTopicsComponent } from './form-field-topics/form-field-topics.
|
|
|
77
79
|
FormFieldTopicsComponent,
|
|
78
80
|
TextFieldModule,
|
|
79
81
|
],
|
|
82
|
+
hostDirectives: [FieldFocusDirective],
|
|
80
83
|
})
|
|
81
84
|
export class FormFieldComponent {
|
|
82
85
|
@Input() uniqueIdentifier: string
|
|
@@ -92,6 +95,8 @@ export class FormFieldComponent {
|
|
|
92
95
|
@ViewChild('titleInput') titleInput: ElementRef
|
|
93
96
|
isOpenData = false
|
|
94
97
|
|
|
98
|
+
fieldFocus = inject(FieldFocusDirective)
|
|
99
|
+
|
|
95
100
|
toggleIsOpenData(event: boolean) {
|
|
96
101
|
this.isOpenData = event
|
|
97
102
|
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/* Glow applied by FieldFocusDirective (gnUiFieldFocus) to a focused field or,
|
|
2
|
+
when the field is hidden, to its whole section. */
|
|
3
|
+
.gn-ui-field-focus-glow {
|
|
4
|
+
position: relative;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
.gn-ui-field-focus-glow::after {
|
|
8
|
+
content: '';
|
|
9
|
+
position: absolute;
|
|
10
|
+
inset: -8px;
|
|
11
|
+
border-radius: 8px;
|
|
12
|
+
background-color: color-mix(in srgb, var(--color-primary) 12%, transparent);
|
|
13
|
+
pointer-events: none;
|
|
14
|
+
animation: gn-ui-field-focus-glow 3s ease-out forwards;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
.gn-ui-field-focus-glow::before {
|
|
18
|
+
content: '';
|
|
19
|
+
position: absolute;
|
|
20
|
+
inset: -16px;
|
|
21
|
+
border: 2px dashed var(--color-primary);
|
|
22
|
+
border-radius: 10px;
|
|
23
|
+
pointer-events: none;
|
|
24
|
+
animation: gn-ui-field-focus-glow 3s ease-out forwards;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
@keyframes gn-ui-field-focus-glow {
|
|
28
|
+
0%,
|
|
29
|
+
55% {
|
|
30
|
+
opacity: 1;
|
|
31
|
+
}
|
|
32
|
+
100% {
|
|
33
|
+
opacity: 0;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
track sectionTracker($index, section)
|
|
5
5
|
) {
|
|
6
6
|
@if (!section.hidden) {
|
|
7
|
-
<div
|
|
7
|
+
<div
|
|
8
|
+
class="flex flex-col gap-6 border p-8 rounded-[8px] shadow scroll-mt-[90px]"
|
|
9
|
+
gnUiFieldFocus
|
|
10
|
+
#sectionFocus="fieldFocus"
|
|
11
|
+
>
|
|
8
12
|
<div class="flex flex-col gap-2">
|
|
9
13
|
@if (section.labelKey) {
|
|
10
14
|
<div class="text-2xl font-title text-black" translate>
|
|
@@ -1,15 +1,23 @@
|
|
|
1
1
|
import { CommonModule } from '@angular/common'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
ChangeDetectionStrategy,
|
|
4
|
+
Component,
|
|
5
|
+
inject,
|
|
6
|
+
OnDestroy,
|
|
7
|
+
OnInit,
|
|
8
|
+
viewChildren,
|
|
9
|
+
} from '@angular/core'
|
|
3
10
|
import { EditorFacade } from '../../+state/editor.facade'
|
|
4
11
|
import { EditorFieldValue } from '../../models'
|
|
5
|
-
import { FormFieldComponent } from './form-field'
|
|
12
|
+
import { FieldFocusDirective, FormFieldComponent } from './form-field'
|
|
6
13
|
import { TranslateDirective } from '@ngx-translate/core'
|
|
7
14
|
import {
|
|
8
15
|
EditorFieldWithValue,
|
|
9
16
|
EditorSectionWithValues,
|
|
10
17
|
} from '../../+state/editor.models'
|
|
11
|
-
import { map } from 'rxjs'
|
|
18
|
+
import { firstValueFrom, map, Subscription, withLatestFrom } from 'rxjs'
|
|
12
19
|
import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
20
|
+
import { switchMap } from 'rxjs/operators'
|
|
13
21
|
|
|
14
22
|
@Component({
|
|
15
23
|
selector: 'gn-ui-record-form',
|
|
@@ -17,15 +25,63 @@ import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/l
|
|
|
17
25
|
styleUrls: ['./record-form.component.css'],
|
|
18
26
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
19
27
|
standalone: true,
|
|
20
|
-
imports: [
|
|
28
|
+
imports: [
|
|
29
|
+
CommonModule,
|
|
30
|
+
FormFieldComponent,
|
|
31
|
+
FieldFocusDirective,
|
|
32
|
+
TranslateDirective,
|
|
33
|
+
],
|
|
21
34
|
})
|
|
22
|
-
export class RecordFormComponent {
|
|
35
|
+
export class RecordFormComponent implements OnInit, OnDestroy {
|
|
23
36
|
facade = inject(EditorFacade)
|
|
37
|
+
subscription = new Subscription()
|
|
24
38
|
|
|
25
39
|
recordUniqueIdentifier$ = this.facade.record$.pipe(
|
|
26
40
|
map((record) => record.uniqueIdentifier)
|
|
27
41
|
)
|
|
28
42
|
|
|
43
|
+
focusFieldWithPage$ = this.facade.focusedField$.pipe(
|
|
44
|
+
switchMap(async (field) => {
|
|
45
|
+
const location = await this.getFieldLocation(field)
|
|
46
|
+
return [field, location?.page ?? null, location?.section ?? -1] as const
|
|
47
|
+
})
|
|
48
|
+
)
|
|
49
|
+
|
|
50
|
+
formFields = viewChildren(FormFieldComponent)
|
|
51
|
+
sectionFocusDirectives = viewChildren<FieldFocusDirective>('sectionFocus')
|
|
52
|
+
|
|
53
|
+
focusField(model: CatalogRecordKeys, sectionIndex: number) {
|
|
54
|
+
const field = this.formFields().find((f) => f.model === model)
|
|
55
|
+
if (field) {
|
|
56
|
+
field.fieldFocus.focusField()
|
|
57
|
+
return
|
|
58
|
+
}
|
|
59
|
+
this.sectionFocusDirectives()[sectionIndex]?.focusField(false)
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
ngOnInit() {
|
|
63
|
+
this.subscription.add(
|
|
64
|
+
this.focusFieldWithPage$
|
|
65
|
+
.pipe(
|
|
66
|
+
withLatestFrom(
|
|
67
|
+
this.facade.currentPage$,
|
|
68
|
+
([field, fieldPage, fieldSection], currentPage) =>
|
|
69
|
+
[field, fieldPage, fieldSection, currentPage] as const
|
|
70
|
+
)
|
|
71
|
+
)
|
|
72
|
+
.subscribe(([field, fieldPage, fieldSection, currentPage]) => {
|
|
73
|
+
if (fieldPage !== null && fieldPage !== currentPage) {
|
|
74
|
+
this.facade.setCurrentPage(fieldPage)
|
|
75
|
+
}
|
|
76
|
+
setTimeout(() => this.focusField(field, fieldSection))
|
|
77
|
+
})
|
|
78
|
+
)
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
ngOnDestroy() {
|
|
82
|
+
this.subscription.unsubscribe()
|
|
83
|
+
}
|
|
84
|
+
|
|
29
85
|
handleFieldValueChange(model: CatalogRecordKeys, newValue: EditorFieldValue) {
|
|
30
86
|
if (!model) {
|
|
31
87
|
return
|
|
@@ -40,4 +96,20 @@ export class RecordFormComponent {
|
|
|
40
96
|
sectionTracker(index: number, section: EditorSectionWithValues) {
|
|
41
97
|
return section.labelKey
|
|
42
98
|
}
|
|
99
|
+
|
|
100
|
+
async getFieldLocation(
|
|
101
|
+
model: CatalogRecordKeys
|
|
102
|
+
): Promise<{ page: number; section: number } | null> {
|
|
103
|
+
const config = await firstValueFrom(this.facade.editorConfig$)
|
|
104
|
+
const page = config.pages.findIndex((p) =>
|
|
105
|
+
p.sections.some((s) => s.fields.some((f) => f.model === model))
|
|
106
|
+
)
|
|
107
|
+
if (page < 0) {
|
|
108
|
+
return null
|
|
109
|
+
}
|
|
110
|
+
const section = config.pages[page].sections
|
|
111
|
+
.filter((s) => !s.hidden)
|
|
112
|
+
.findIndex((s) => s.fields.some((f) => f.model === model))
|
|
113
|
+
return { page, section }
|
|
114
|
+
}
|
|
43
115
|
}
|
|
@@ -4,10 +4,12 @@ import {
|
|
|
4
4
|
EditorField,
|
|
5
5
|
EditorSection,
|
|
6
6
|
} from './models/editor-config.model'
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
|
|
8
|
+
|
|
9
|
+
export interface ISOTopic {
|
|
10
|
+
value: string
|
|
11
|
+
label: string
|
|
12
|
+
}
|
|
11
13
|
|
|
12
14
|
/**
|
|
13
15
|
* This file contains the configuration of the fields that will be displayed in the editor.
|
|
@@ -359,75 +361,86 @@ export const SPATIAL_SCOPES: Keyword[] = [
|
|
|
359
361
|
]
|
|
360
362
|
|
|
361
363
|
/************************************************************
|
|
362
|
-
***************
|
|
364
|
+
*************** ISO TOPICS **************
|
|
363
365
|
************************************************************
|
|
364
366
|
*/
|
|
365
367
|
|
|
366
|
-
|
|
367
|
-
|
|
368
|
+
// label keys mirror the ISO MD_TopicCategoryCode value for consistency
|
|
369
|
+
// TODO: correctly handle code lists; for instance, this code list is specific to ISO 19139
|
|
370
|
+
export const ISO_TOPICS: ISOTopic[] = [
|
|
371
|
+
{ value: 'biota', label: marker('editor.record.form.topics.iso.biota') },
|
|
368
372
|
{
|
|
369
373
|
value: 'boundaries',
|
|
370
|
-
label: 'editor.record.form.topics.
|
|
374
|
+
label: marker('editor.record.form.topics.iso.boundaries'),
|
|
371
375
|
},
|
|
372
376
|
{
|
|
373
377
|
value: 'climatologyMeteorologyAtmosphere',
|
|
374
|
-
label:
|
|
378
|
+
label: marker(
|
|
379
|
+
'editor.record.form.topics.iso.climatologyMeteorologyAtmosphere'
|
|
380
|
+
),
|
|
381
|
+
},
|
|
382
|
+
{
|
|
383
|
+
value: 'economy',
|
|
384
|
+
label: marker('editor.record.form.topics.iso.economy'),
|
|
385
|
+
},
|
|
386
|
+
{
|
|
387
|
+
value: 'elevation',
|
|
388
|
+
label: marker('editor.record.form.topics.iso.elevation'),
|
|
375
389
|
},
|
|
376
|
-
{ value: 'economy', label: 'editor.record.form.topics.inspire.economy' },
|
|
377
|
-
{ value: 'elevation', label: 'editor.record.form.topics.inspire.elevation' },
|
|
378
390
|
{
|
|
379
391
|
value: 'environment',
|
|
380
|
-
label: 'editor.record.form.topics.
|
|
392
|
+
label: marker('editor.record.form.topics.iso.environment'),
|
|
393
|
+
},
|
|
394
|
+
{
|
|
395
|
+
value: 'farming',
|
|
396
|
+
label: marker('editor.record.form.topics.iso.farming'),
|
|
397
|
+
},
|
|
398
|
+
{
|
|
399
|
+
value: 'geoscientificInformation',
|
|
400
|
+
label: marker('editor.record.form.topics.iso.geoscientificInformation'),
|
|
381
401
|
},
|
|
382
|
-
{ value: 'farming', label: 'editor.record.form.topics.inspire.farming' },
|
|
383
402
|
{
|
|
384
|
-
value: '
|
|
385
|
-
label: 'editor.record.form.topics.
|
|
403
|
+
value: 'health',
|
|
404
|
+
label: marker('editor.record.form.topics.iso.health'),
|
|
386
405
|
},
|
|
387
|
-
{ value: 'health', label: 'editor.record.form.topics.inspire.health' },
|
|
388
406
|
{
|
|
389
407
|
value: 'imageryBaseMapsEarthCover',
|
|
390
|
-
label: 'editor.record.form.topics.
|
|
408
|
+
label: marker('editor.record.form.topics.iso.imageryBaseMapsEarthCover'),
|
|
409
|
+
},
|
|
410
|
+
{
|
|
411
|
+
value: 'inlandWaters',
|
|
412
|
+
label: marker('editor.record.form.topics.iso.inlandWaters'),
|
|
391
413
|
},
|
|
392
|
-
{ value: 'inlandWaters', label: 'editor.record.form.topics.inspire.waters' },
|
|
393
414
|
{
|
|
394
415
|
value: 'intelligenceMilitary',
|
|
395
|
-
label: 'editor.record.form.topics.
|
|
416
|
+
label: marker('editor.record.form.topics.iso.intelligenceMilitary'),
|
|
417
|
+
},
|
|
418
|
+
{
|
|
419
|
+
value: 'location',
|
|
420
|
+
label: marker('editor.record.form.topics.iso.location'),
|
|
421
|
+
},
|
|
422
|
+
{
|
|
423
|
+
value: 'oceans',
|
|
424
|
+
label: marker('editor.record.form.topics.iso.oceans'),
|
|
396
425
|
},
|
|
397
|
-
{ value: 'Location', label: 'editor.record.form.topics.inspire.location' },
|
|
398
|
-
{ value: 'Oceans', label: 'editor.record.form.topics.inspire.oceans' },
|
|
399
426
|
{
|
|
400
427
|
value: 'planningCadastre',
|
|
401
|
-
label: 'editor.record.form.topics.
|
|
428
|
+
label: marker('editor.record.form.topics.iso.planningCadastre'),
|
|
402
429
|
},
|
|
403
|
-
{ value: 'Society', label: 'editor.record.form.topics.inspire.society' },
|
|
404
|
-
{ value: 'Structure', label: 'editor.record.form.topics.inspire.structure' },
|
|
405
430
|
{
|
|
406
|
-
value: '
|
|
407
|
-
label: 'editor.record.form.topics.
|
|
431
|
+
value: 'society',
|
|
432
|
+
label: marker('editor.record.form.topics.iso.society'),
|
|
433
|
+
},
|
|
434
|
+
{
|
|
435
|
+
value: 'structure',
|
|
436
|
+
label: marker('editor.record.form.topics.iso.structure'),
|
|
437
|
+
},
|
|
438
|
+
{
|
|
439
|
+
value: 'transportation',
|
|
440
|
+
label: marker('editor.record.form.topics.iso.transportation'),
|
|
408
441
|
},
|
|
409
442
|
{
|
|
410
443
|
value: 'utilitiesCommunication',
|
|
411
|
-
label: 'editor.record.form.topics.
|
|
444
|
+
label: marker('editor.record.form.topics.iso.utilitiesCommunication'),
|
|
412
445
|
},
|
|
413
446
|
]
|
|
414
|
-
|
|
415
|
-
marker('editor.record.form.topics.inspire.biota')
|
|
416
|
-
marker('editor.record.form.topics.inspire.boundaries')
|
|
417
|
-
marker('editor.record.form.topics.inspire.climatology')
|
|
418
|
-
marker('editor.record.form.topics.inspire.economy')
|
|
419
|
-
marker('editor.record.form.topics.inspire.elevation')
|
|
420
|
-
marker('editor.record.form.topics.inspire.environnement')
|
|
421
|
-
marker('editor.record.form.topics.inspire.farming')
|
|
422
|
-
marker('editor.record.form.topics.inspire.geoscientific')
|
|
423
|
-
marker('editor.record.form.topics.inspire.health')
|
|
424
|
-
marker('editor.record.form.topics.inspire.imagery')
|
|
425
|
-
marker('editor.record.form.topics.inspire.intelligence')
|
|
426
|
-
marker('editor.record.form.topics.inspire.location')
|
|
427
|
-
marker('editor.record.form.topics.inspire.oceans')
|
|
428
|
-
marker('editor.record.form.topics.inspire.planning')
|
|
429
|
-
marker('editor.record.form.topics.inspire.society')
|
|
430
|
-
marker('editor.record.form.topics.inspire.structure')
|
|
431
|
-
marker('editor.record.form.topics.inspire.transportation')
|
|
432
|
-
marker('editor.record.form.topics.inspire.utilities')
|
|
433
|
-
marker('editor.record.form.topics.inspire.waters')
|
|
@@ -19,9 +19,13 @@ export interface FormFieldConfig {
|
|
|
19
19
|
// This is used for instance to target only certain online resources in a field
|
|
20
20
|
type OnlineLinkResourceSpecifier = `onlineResourceType:link`
|
|
21
21
|
type DatasetDistributionsSpecifier = `onlineResourceType:!link`
|
|
22
|
+
// When set on the `contacts` field, contacts are rendered as editable detail
|
|
23
|
+
// fields (ContactDetailsFormComponent) instead of cards (ContactCardComponent)
|
|
24
|
+
type EditableContactDetailsSpecifier = `contact:editableDetails`
|
|
22
25
|
export type FieldModelSpecifier =
|
|
23
26
|
| OnlineLinkResourceSpecifier
|
|
24
27
|
| DatasetDistributionsSpecifier
|
|
28
|
+
| EditableContactDetailsSpecifier
|
|
25
29
|
|
|
26
30
|
export type FormFieldComponentName =
|
|
27
31
|
| 'form-field-constraints-shortcuts'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Injectable, inject } from '@angular/core'
|
|
2
|
-
import {
|
|
2
|
+
import { Observable, switchMap } from 'rxjs'
|
|
3
3
|
import { map, tap } from 'rxjs/operators'
|
|
4
4
|
import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
5
5
|
import { EditorConfig } from '../models/'
|
|
@@ -2,6 +2,23 @@ import { Injectable } from '@angular/core'
|
|
|
2
2
|
import { extend } from 'ol/extent.js'
|
|
3
3
|
import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
4
4
|
import { BoundingBox, getGeometryBoundingBox } from '../../../../../../libs/util/shared/src'
|
|
5
|
+
import { MapContextLayer } from '@geospatial-sdk/core'
|
|
6
|
+
import {
|
|
7
|
+
createSpatialExtentLayer,
|
|
8
|
+
SpatialExtentLayerStyle,
|
|
9
|
+
} from '../../../../../../libs/ui/map/src'
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Style of the extent overlay drawn on top of the previewed data: a dashed
|
|
13
|
+
* black outline over a very light fill, so the extent stays readable without
|
|
14
|
+
* hiding the data underneath.
|
|
15
|
+
*/
|
|
16
|
+
const RECORD_EXTENT_OVERLAY_STYLE: SpatialExtentLayerStyle = {
|
|
17
|
+
'stroke-color': 'rgba(0, 0, 0, 0.6)',
|
|
18
|
+
'stroke-width': 2,
|
|
19
|
+
'stroke-line-dash': [8, 6],
|
|
20
|
+
'fill-color': 'rgba(0, 0, 0, 0.03)',
|
|
21
|
+
}
|
|
5
22
|
|
|
6
23
|
@Injectable({
|
|
7
24
|
providedIn: 'root',
|
|
@@ -26,4 +43,20 @@ export class MapUtilsService {
|
|
|
26
43
|
[Infinity, Infinity, -Infinity, -Infinity]
|
|
27
44
|
)
|
|
28
45
|
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Builds a non-interactive overlay layer drawing the spatial extent(s)
|
|
49
|
+
* declared in the record's metadata (bounding boxes and/or geometries).
|
|
50
|
+
* Returns null when the record has no usable spatial extent.
|
|
51
|
+
*
|
|
52
|
+
* This is purely for display and is independent from the map's initial view,
|
|
53
|
+
* which is derived separately (see {@link getRecordExtent}).
|
|
54
|
+
*/
|
|
55
|
+
getRecordExtentLayer(record: Partial<CatalogRecord>): MapContextLayer | null {
|
|
56
|
+
return createSpatialExtentLayer(record.spatialExtents ?? [], {
|
|
57
|
+
label: 'Spatial extent',
|
|
58
|
+
clickable: false,
|
|
59
|
+
style: RECORD_EXTENT_OVERLAY_STYLE,
|
|
60
|
+
})
|
|
61
|
+
}
|
|
29
62
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './lib/notify-reuse-form/notify-reuse-form.component'
|
package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.css
ADDED
|
File without changes
|
package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.html
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
@if (record) {}
|