geonetwork-ui 2.10.0-dev.300bb3d2d → 2.10.0-dev.3445256ab
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 +573 -123
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/index.d.ts +119 -27
- package/index.d.ts.map +1 -1
- package/package.json +1 -1
- 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/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 +4 -0
- package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +54 -32
- package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +46 -0
- package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +11 -0
- 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/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/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 +38 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-constraints-shortcuts/form-field-constraints-shortcuts.component.ts +33 -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.component.css +37 -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.ts +59 -3
- 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/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/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 +37 -0
- package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.ts +70 -0
- 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 +4 -0
- 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 +11 -10
- package/src/libs/util/app-config/src/lib/app-config.ts +49 -0
- 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/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/utils/index.ts +1 -0
- package/src/libs/util/shared/src/lib/utils/user-display.ts +32 -0
- package/tailwind.base.css +11 -2
- package/translations/de.json +10 -1
- package/translations/en.json +10 -1
- package/translations/es.json +10 -1
- package/translations/fr.json +10 -1
- package/translations/it.json +10 -1
- package/translations/nl.json +10 -1
- package/translations/pt.json +10 -1
- package/translations/sk.json +10 -1
|
@@ -68,6 +68,7 @@ export const VLAANDEREN_DATASET_RECORD: DatasetRecord = {
|
|
|
68
68
|
temporalExtents: [],
|
|
69
69
|
topics: ['biodiversity'],
|
|
70
70
|
lineage: '',
|
|
71
|
+
sourceRecords: [],
|
|
71
72
|
recordUpdated: new Date('2024-09-19T01:15:09.732Z'),
|
|
72
73
|
resourceUpdated: new Date('2021-04-14T11:15+02:00'),
|
|
73
74
|
status: 'completed',
|
|
@@ -447,5 +447,13 @@ export const WALLONIE_REUSE_SPW_RECORD: ReuseRecord = {
|
|
|
447
447
|
'https://metawal.wallonie.be/geonetwork/srv/api/records/83809bcd-1763-4d28-b820-2b9828083ba5'
|
|
448
448
|
),
|
|
449
449
|
lineage: "L'application a été développée sur base de l'API GeoViewer",
|
|
450
|
+
sourceRecords: [
|
|
451
|
+
{
|
|
452
|
+
uuid: 'ee965118-2416-4d48-b07e-bbc696f002c2',
|
|
453
|
+
title:
|
|
454
|
+
'SCoT (Schéma de cohérence territoriale) en région Hauts-de-France',
|
|
455
|
+
href: 'https://metawal.wallonie.be/geonetwork/srv/api/records/ee965118-2416-4d48-b07e-bbc696f002c2',
|
|
456
|
+
},
|
|
457
|
+
],
|
|
450
458
|
temporalExtents: [],
|
|
451
459
|
}
|
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
readKind,
|
|
10
10
|
readLandingPage,
|
|
11
11
|
readLineage,
|
|
12
|
+
readSourceRecords,
|
|
12
13
|
readOnlineResources,
|
|
13
14
|
readOtherLanguages,
|
|
14
15
|
readOwnerOrganization,
|
|
@@ -25,6 +26,7 @@ import {
|
|
|
25
26
|
writeKind,
|
|
26
27
|
writeLandingPage,
|
|
27
28
|
writeLineage,
|
|
29
|
+
writeSourceRecords,
|
|
28
30
|
writeOnlineResources,
|
|
29
31
|
writeOtherLanguages,
|
|
30
32
|
writeRecordCreated,
|
|
@@ -53,6 +55,7 @@ export class Iso191153Converter extends Iso19139Converter {
|
|
|
53
55
|
this.readers['ownerOrganization'] = readOwnerOrganization
|
|
54
56
|
this.readers['landingPage'] = readLandingPage
|
|
55
57
|
this.readers['lineage'] = readLineage
|
|
58
|
+
this.readers['sourceRecords'] = readSourceRecords
|
|
56
59
|
this.readers['onlineResources'] = readOnlineResources
|
|
57
60
|
this.readers['defaultLanguage'] = readDefaultLanguage
|
|
58
61
|
this.readers['otherLanguages'] = readOtherLanguages
|
|
@@ -72,6 +75,7 @@ export class Iso191153Converter extends Iso19139Converter {
|
|
|
72
75
|
this.writers['ownerOrganization'] = () => undefined // fixme: find a way to store this value properly
|
|
73
76
|
this.writers['landingPage'] = writeLandingPage
|
|
74
77
|
this.writers['lineage'] = writeLineage
|
|
78
|
+
this.writers['sourceRecords'] = writeSourceRecords
|
|
75
79
|
this.writers['onlineResources'] = writeOnlineResources
|
|
76
80
|
this.writers['status'] = writeStatus
|
|
77
81
|
this.writers['spatialRepresentation'] = writeSpatialRepresentation
|
|
@@ -167,6 +171,9 @@ export class Iso191153Converter extends Iso19139Converter {
|
|
|
167
171
|
'gmd:fileName': 'mcc:fileName',
|
|
168
172
|
'gmd:fileDescription': 'mcc:fileDescription',
|
|
169
173
|
|
|
174
|
+
// lineage sources
|
|
175
|
+
'gmd:source': 'mrl:source',
|
|
176
|
+
|
|
170
177
|
// no more URL elements
|
|
171
178
|
'gmd:URL': 'gco:CharacterString',
|
|
172
179
|
})
|
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
extractCharacterString,
|
|
22
22
|
extractDatasetOnlineResources,
|
|
23
23
|
extractDateTime,
|
|
24
|
+
extractSourceRecords,
|
|
24
25
|
extractLocalizedCharacterString,
|
|
25
26
|
extractReuseOnlineResources,
|
|
26
27
|
extractRole,
|
|
@@ -31,6 +32,7 @@ import {
|
|
|
31
32
|
import {
|
|
32
33
|
Individual,
|
|
33
34
|
LanguageCode,
|
|
35
|
+
SourceRecord,
|
|
34
36
|
OnlineResource,
|
|
35
37
|
Organization,
|
|
36
38
|
OrganizationTranslations,
|
|
@@ -291,6 +293,12 @@ export function readLineage(
|
|
|
291
293
|
)(rootEl)
|
|
292
294
|
}
|
|
293
295
|
|
|
296
|
+
export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
|
|
297
|
+
return extractSourceRecords(
|
|
298
|
+
pipe(findNestedElement('mdb:resourceLineage', 'mrl:LI_Lineage'))(rootEl)
|
|
299
|
+
)
|
|
300
|
+
}
|
|
301
|
+
|
|
294
302
|
function extractDateInfo(
|
|
295
303
|
type: 'creation' | 'revision' | 'publication'
|
|
296
304
|
): ChainableFunction<XmlElement, Date> {
|
|
@@ -34,6 +34,7 @@ import {
|
|
|
34
34
|
} from '../function-utils'
|
|
35
35
|
import {
|
|
36
36
|
appendKeywords,
|
|
37
|
+
appendSourceRecords,
|
|
37
38
|
appendOnlineResource,
|
|
38
39
|
appendServiceOnlineResources,
|
|
39
40
|
createDistributionInfo,
|
|
@@ -564,3 +565,10 @@ export function writeOtherLanguages(record: DatasetRecord, rootEl: XmlElement) {
|
|
|
564
565
|
)
|
|
565
566
|
)(rootEl)
|
|
566
567
|
}
|
|
568
|
+
|
|
569
|
+
export function writeSourceRecords(record: DatasetRecord, rootEl: XmlElement) {
|
|
570
|
+
pipe(
|
|
571
|
+
findNestedChildOrCreate('mdb:resourceLineage', 'mrl:LI_Lineage'),
|
|
572
|
+
appendSourceRecords(record.sourceRecords)
|
|
573
|
+
)(rootEl)
|
|
574
|
+
}
|
|
@@ -30,6 +30,7 @@ import {
|
|
|
30
30
|
readLegalConstraints,
|
|
31
31
|
readLicenses,
|
|
32
32
|
readLineage,
|
|
33
|
+
readSourceRecords,
|
|
33
34
|
readOnlineResources,
|
|
34
35
|
readOtherConstraints,
|
|
35
36
|
readOtherLanguages,
|
|
@@ -62,6 +63,7 @@ import {
|
|
|
62
63
|
writeLegalConstraints,
|
|
63
64
|
writeLicenses,
|
|
64
65
|
writeLineage,
|
|
66
|
+
writeSourceRecords,
|
|
65
67
|
writeOnlineResources,
|
|
66
68
|
writeOtherConstraints,
|
|
67
69
|
writeRecordUpdated,
|
|
@@ -112,6 +114,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
112
114
|
spatialRepresentation: readSpatialRepresentation,
|
|
113
115
|
overviews: readOverviews,
|
|
114
116
|
lineage: readLineage,
|
|
117
|
+
sourceRecords: readSourceRecords,
|
|
115
118
|
onlineResources: readOnlineResources,
|
|
116
119
|
temporalExtents: readTemporalExtents,
|
|
117
120
|
spatialExtents: readSpatialExtents,
|
|
@@ -153,6 +156,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
153
156
|
spatialRepresentation: writeSpatialRepresentation,
|
|
154
157
|
overviews: writeGraphicOverviews,
|
|
155
158
|
lineage: writeLineage,
|
|
159
|
+
sourceRecords: writeSourceRecords,
|
|
156
160
|
onlineResources: writeOnlineResources,
|
|
157
161
|
temporalExtents: writeTemporalExtents,
|
|
158
162
|
spatialExtents: writeSpatialExtents,
|
|
@@ -295,6 +299,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
295
299
|
)
|
|
296
300
|
const temporalExtents = this.readers['temporalExtents'](rootEl, tr)
|
|
297
301
|
const lineage = this.readers['lineage'](rootEl, tr)
|
|
302
|
+
const sourceRecords = this.readers['sourceRecords'](rootEl, tr)
|
|
298
303
|
const updateFrequency = this.readers['updateFrequency'](rootEl, tr)
|
|
299
304
|
|
|
300
305
|
return this.afterRecordRead({
|
|
@@ -302,6 +307,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
302
307
|
kind,
|
|
303
308
|
status,
|
|
304
309
|
lineage,
|
|
310
|
+
...(sourceRecords && { sourceRecords }),
|
|
305
311
|
...(spatialRepresentation && { spatialRepresentation }),
|
|
306
312
|
temporalExtents,
|
|
307
313
|
updateFrequency,
|
|
@@ -309,6 +315,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
309
315
|
} as DatasetRecord)
|
|
310
316
|
} else if (kind === 'reuse') {
|
|
311
317
|
const lineage = this.readers['lineage'](rootEl, tr)
|
|
318
|
+
const sourceRecords = this.readers['sourceRecords'](rootEl, tr)
|
|
312
319
|
const temporalExtents = this.readers['temporalExtents'](rootEl, tr)
|
|
313
320
|
const reuseType = this.readers['reuseType'](rootEl, tr)
|
|
314
321
|
|
|
@@ -316,6 +323,7 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
316
323
|
...this.readBaseRecord(rootEl, tr),
|
|
317
324
|
kind,
|
|
318
325
|
lineage,
|
|
326
|
+
...(sourceRecords && { sourceRecords }),
|
|
319
327
|
temporalExtents,
|
|
320
328
|
reuseType,
|
|
321
329
|
} as ReuseRecord)
|
|
@@ -411,7 +419,10 @@ export class Iso19139Converter extends BaseConverter<string> {
|
|
|
411
419
|
this.writers['spatialExtents'](record, rootEl)
|
|
412
420
|
;(fieldChanged('lineage') || fieldChanged('translations')) &&
|
|
413
421
|
this.writers['lineage'](record, rootEl)
|
|
422
|
+
fieldChanged('sourceRecords') &&
|
|
423
|
+
this.writers['sourceRecords'](record, rootEl)
|
|
414
424
|
}
|
|
425
|
+
|
|
415
426
|
fieldChanged('otherLanguages') &&
|
|
416
427
|
this.writers['otherLanguages'](record, rootEl)
|
|
417
428
|
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
Keyword,
|
|
9
9
|
KeywordTranslations,
|
|
10
10
|
LanguageCode,
|
|
11
|
+
SourceRecord,
|
|
11
12
|
ModelTranslations,
|
|
12
13
|
OnlineLinkResource,
|
|
13
14
|
OnlineResource,
|
|
@@ -894,6 +895,38 @@ export function readLineage(
|
|
|
894
895
|
)(rootEl)
|
|
895
896
|
}
|
|
896
897
|
|
|
898
|
+
export function extractSourceRecords(liLineageEl: XmlElement): SourceRecord[] {
|
|
899
|
+
if (!liLineageEl) return []
|
|
900
|
+
return pipe(
|
|
901
|
+
findChildrenElement('gmd:source', false),
|
|
902
|
+
mapArray((el) => {
|
|
903
|
+
const uuid = readAttribute('uuidref')(el)
|
|
904
|
+
const title = readAttribute('xlink:title')(el)
|
|
905
|
+
const href = readAttribute('xlink:href')(el)
|
|
906
|
+
if (!uuid && !title && !href) return null
|
|
907
|
+
return {
|
|
908
|
+
...(uuid ? { uuid } : {}),
|
|
909
|
+
...(title ? { title } : {}),
|
|
910
|
+
...(href ? { href } : {}),
|
|
911
|
+
} as SourceRecord
|
|
912
|
+
}),
|
|
913
|
+
filterArray((s): s is SourceRecord => s !== null)
|
|
914
|
+
)(liLineageEl)
|
|
915
|
+
}
|
|
916
|
+
|
|
917
|
+
export function readSourceRecords(rootEl: XmlElement): SourceRecord[] {
|
|
918
|
+
return extractSourceRecords(
|
|
919
|
+
pipe(
|
|
920
|
+
findNestedElement(
|
|
921
|
+
'gmd:dataQualityInfo',
|
|
922
|
+
'gmd:DQ_DataQuality',
|
|
923
|
+
'gmd:lineage',
|
|
924
|
+
'gmd:LI_Lineage'
|
|
925
|
+
)
|
|
926
|
+
)(rootEl)
|
|
927
|
+
)
|
|
928
|
+
}
|
|
929
|
+
|
|
897
930
|
export function readUpdateFrequency(rootEl: XmlElement): UpdateFrequency {
|
|
898
931
|
return pipe(
|
|
899
932
|
findIdentification(),
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
Individual,
|
|
9
9
|
Keyword,
|
|
10
10
|
LanguageCode,
|
|
11
|
+
SourceRecord,
|
|
11
12
|
RecordStatus,
|
|
12
13
|
RecordTranslations,
|
|
13
14
|
ReuseRecord,
|
|
@@ -1231,6 +1232,38 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
|
|
|
1231
1232
|
)(rootEl)
|
|
1232
1233
|
}
|
|
1233
1234
|
|
|
1235
|
+
export function appendSourceRecords(
|
|
1236
|
+
sources: SourceRecord[]
|
|
1237
|
+
): ChainableFunction<XmlElement, XmlElement> {
|
|
1238
|
+
return pipe(
|
|
1239
|
+
removeChildrenByName('gmd:source'),
|
|
1240
|
+
appendChildren(
|
|
1241
|
+
...sources
|
|
1242
|
+
.filter((source) => source.uuid || source.title || source.href)
|
|
1243
|
+
.map((source) =>
|
|
1244
|
+
pipe(
|
|
1245
|
+
createElement('gmd:source'),
|
|
1246
|
+
source.uuid ? writeAttribute('uuidref', source.uuid) : noop,
|
|
1247
|
+
source.title ? writeAttribute('xlink:title', source.title) : noop,
|
|
1248
|
+
source.href ? writeAttribute('xlink:href', source.href) : noop
|
|
1249
|
+
)
|
|
1250
|
+
)
|
|
1251
|
+
)
|
|
1252
|
+
)
|
|
1253
|
+
}
|
|
1254
|
+
|
|
1255
|
+
export function writeSourceRecords(record: DatasetRecord, rootEl: XmlElement) {
|
|
1256
|
+
pipe(
|
|
1257
|
+
findNestedChildOrCreate(
|
|
1258
|
+
'gmd:dataQualityInfo',
|
|
1259
|
+
'gmd:DQ_DataQuality',
|
|
1260
|
+
'gmd:lineage',
|
|
1261
|
+
'gmd:LI_Lineage'
|
|
1262
|
+
),
|
|
1263
|
+
appendSourceRecords(record.sourceRecords)
|
|
1264
|
+
)(rootEl)
|
|
1265
|
+
}
|
|
1266
|
+
|
|
1234
1267
|
export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
|
|
1235
1268
|
switch (endpoint.accessServiceProtocol.toLowerCase()) {
|
|
1236
1269
|
case 'wfs':
|
|
@@ -44,6 +44,10 @@ export class AuthService {
|
|
|
44
44
|
window.location.href
|
|
45
45
|
).toString()
|
|
46
46
|
)
|
|
47
|
+
.replace(
|
|
48
|
+
'${current_path}',
|
|
49
|
+
this.location.prepareExternalUrl(this.location.path())
|
|
50
|
+
)
|
|
47
51
|
.replace('${lang2}', toLang2(this.translateService.currentLang))
|
|
48
52
|
.replace('${lang3}', toLang3(this.translateService.currentLang))
|
|
49
53
|
}
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
import { Injectable, InjectionToken, inject } from '@angular/core'
|
|
7
7
|
import {
|
|
8
8
|
assertValidXml,
|
|
9
|
+
BaseConverter,
|
|
9
10
|
findConverterForDocument,
|
|
10
11
|
Gn4Converter,
|
|
11
12
|
Gn4SearchResults,
|
|
@@ -61,6 +62,12 @@ export const DISABLE_DRAFT = new InjectionToken<boolean>('gnDisableDraft', {
|
|
|
61
62
|
factory: () => false,
|
|
62
63
|
})
|
|
63
64
|
|
|
65
|
+
export const DEFAULT_RECORD_CONVERTER = new InjectionToken<
|
|
66
|
+
BaseConverter<string>
|
|
67
|
+
>('defaultRecordConverter', {
|
|
68
|
+
factory: () => new Iso19139Converter(),
|
|
69
|
+
})
|
|
70
|
+
|
|
64
71
|
@Injectable()
|
|
65
72
|
export class Gn4Repository implements RecordsRepositoryInterface {
|
|
66
73
|
private httpClient = inject(HttpClient)
|
|
@@ -72,6 +79,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
|
|
|
72
79
|
private gn4LanguagesApi = inject(LanguagesApiService)
|
|
73
80
|
private settingsService = inject(Gn4SettingsService)
|
|
74
81
|
private disableDraft = inject(DISABLE_DRAFT, { optional: true }) ?? false
|
|
82
|
+
private defaultConverter = inject(DEFAULT_RECORD_CONVERTER)
|
|
75
83
|
|
|
76
84
|
_draftsChanged = new Subject<void>()
|
|
77
85
|
draftsChanged$ = this._draftsChanged.asObservable()
|
|
@@ -377,38 +385,52 @@ export class Gn4Repository implements RecordsRepositoryInterface {
|
|
|
377
385
|
openRecordForDuplication(
|
|
378
386
|
uniqueIdentifier: string
|
|
379
387
|
): Observable<[CatalogRecord, string, true] | null> {
|
|
380
|
-
return this.
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
388
|
+
return this.platformService.getUserPermissionsByGroup().pipe(
|
|
389
|
+
map((permissions) => {
|
|
390
|
+
const groupId =
|
|
391
|
+
permissions.find((p) => p.canApprove)?.groupId?.toString() ??
|
|
392
|
+
permissions.find((p) => p.canEdit)?.groupId?.toString()
|
|
393
|
+
if (!groupId)
|
|
394
|
+
throw new Error(
|
|
395
|
+
'Current user has no writable group to duplicate into'
|
|
396
|
+
)
|
|
397
|
+
return groupId
|
|
398
|
+
}),
|
|
399
|
+
switchMap((groupId) =>
|
|
400
|
+
this.gn4RecordsApi
|
|
401
|
+
.create(
|
|
402
|
+
uniqueIdentifier,
|
|
403
|
+
groupId,
|
|
404
|
+
'METADATA',
|
|
405
|
+
'',
|
|
406
|
+
false,
|
|
407
|
+
undefined,
|
|
408
|
+
true,
|
|
409
|
+
false,
|
|
410
|
+
undefined,
|
|
411
|
+
'body',
|
|
412
|
+
false,
|
|
413
|
+
{
|
|
414
|
+
httpHeaderAccept: 'application/json',
|
|
415
|
+
httpContentTypeSelected: 'application/json;charset=UTF-8',
|
|
416
|
+
}
|
|
417
|
+
)
|
|
418
|
+
.pipe(
|
|
419
|
+
switchMap((uniqueIdentifier) => {
|
|
420
|
+
return this.getRecordAsXml(uniqueIdentifier)
|
|
421
|
+
}),
|
|
422
|
+
switchMap((xml) => {
|
|
423
|
+
return from(
|
|
424
|
+
findConverterForDocument(xml)
|
|
425
|
+
.readRecord(xml)
|
|
426
|
+
.then((record) => {
|
|
427
|
+
return [record, xml, true] as [CatalogRecord, string, true]
|
|
428
|
+
})
|
|
429
|
+
)
|
|
430
|
+
})
|
|
409
431
|
)
|
|
410
|
-
})
|
|
411
432
|
)
|
|
433
|
+
)
|
|
412
434
|
}
|
|
413
435
|
|
|
414
436
|
saveRecord(
|
|
@@ -605,10 +627,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
|
|
|
605
627
|
record: CatalogRecord,
|
|
606
628
|
referenceRecordSource?: string
|
|
607
629
|
): Observable<string> {
|
|
608
|
-
// if there's a reference record, use that standard; otherwise, use
|
|
630
|
+
// if there's a reference record, use that standard; otherwise, use standard based on configuration or default
|
|
609
631
|
const converter = referenceRecordSource
|
|
610
632
|
? findConverterForDocument(referenceRecordSource)
|
|
611
|
-
:
|
|
633
|
+
: this.defaultConverter
|
|
612
634
|
return from(converter.writeRecord(record, referenceRecordSource))
|
|
613
635
|
}
|
|
614
636
|
|
|
@@ -12,11 +12,13 @@ import {
|
|
|
12
12
|
} from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
13
13
|
import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
|
|
14
14
|
import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
|
|
15
|
+
import { GroupModel } from '../../../../../../../libs/common/domain/src/lib/model/user/group.model'
|
|
15
16
|
import {
|
|
16
17
|
PlatformServiceInterface,
|
|
17
18
|
UploadEvent,
|
|
18
19
|
} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
19
20
|
import {
|
|
21
|
+
GroupsApiService,
|
|
20
22
|
MeApiService,
|
|
21
23
|
RecordsApiService,
|
|
22
24
|
RegistriesApiService,
|
|
@@ -57,6 +59,7 @@ export const DISABLE_AUTH = new InjectionToken<boolean>('gnDisableAuth', {
|
|
|
57
59
|
export class Gn4PlatformService implements PlatformServiceInterface {
|
|
58
60
|
private meApi = inject(MeApiService)
|
|
59
61
|
private usersApi = inject(UsersApiService)
|
|
62
|
+
private groupsApi = inject(GroupsApiService)
|
|
60
63
|
private mapper = inject(Gn4PlatformMapper)
|
|
61
64
|
private toolsApiService = inject(ToolsApiService)
|
|
62
65
|
private registriesApiService = inject(RegistriesApiService)
|
|
@@ -155,6 +158,49 @@ export class Gn4PlatformService implements PlatformServiceInterface {
|
|
|
155
158
|
return this.users$
|
|
156
159
|
}
|
|
157
160
|
|
|
161
|
+
getUserPermissionsByGroup(): Observable<GroupModel[]> {
|
|
162
|
+
if (this.disableAuth) return of([])
|
|
163
|
+
return combineLatest([this.meApi.getMe(), this.groupsApi.getGroups()]).pipe(
|
|
164
|
+
map(([meResponse, groups]) => {
|
|
165
|
+
if (!meResponse) return []
|
|
166
|
+
if (meResponse.admin) {
|
|
167
|
+
return groups.map((group) => ({
|
|
168
|
+
groupId: group.id,
|
|
169
|
+
groupName: group.name,
|
|
170
|
+
isMember: true,
|
|
171
|
+
canEdit: true,
|
|
172
|
+
canApprove: true,
|
|
173
|
+
canAdministrate: true,
|
|
174
|
+
}))
|
|
175
|
+
}
|
|
176
|
+
const reviewerIds = meResponse.groupsWithReviewer ?? []
|
|
177
|
+
const editorIds = meResponse.groupsWithEditor ?? []
|
|
178
|
+
const memberIds = meResponse.groupsWithRegisteredUser ?? []
|
|
179
|
+
const adminIds = meResponse.groupsWithUserAdmin ?? []
|
|
180
|
+
const groupsById = new Map(groups.map((g) => [g.id, g]))
|
|
181
|
+
return [
|
|
182
|
+
...new Set([
|
|
183
|
+
...reviewerIds,
|
|
184
|
+
...editorIds,
|
|
185
|
+
...groups.map((g) => g.id),
|
|
186
|
+
]),
|
|
187
|
+
]
|
|
188
|
+
.filter((id) => groupsById.has(id))
|
|
189
|
+
.map((id) => {
|
|
190
|
+
const group = groupsById.get(id)
|
|
191
|
+
return {
|
|
192
|
+
groupId: group.id,
|
|
193
|
+
groupName: group.name,
|
|
194
|
+
isMember: memberIds.includes(id),
|
|
195
|
+
canEdit: editorIds.includes(id),
|
|
196
|
+
canApprove: reviewerIds.includes(id),
|
|
197
|
+
canAdministrate: adminIds.includes(id),
|
|
198
|
+
}
|
|
199
|
+
})
|
|
200
|
+
})
|
|
201
|
+
)
|
|
202
|
+
}
|
|
203
|
+
|
|
158
204
|
translateKey(key: string): Observable<string> {
|
|
159
205
|
// if the key is a URI, use the registries API to look for the translation
|
|
160
206
|
if (key.match(/^https?:\/\//)) {
|
|
@@ -254,10 +254,20 @@ export interface DatasetTemporalExtent {
|
|
|
254
254
|
end?: Date
|
|
255
255
|
}
|
|
256
256
|
|
|
257
|
+
/**
|
|
258
|
+
* Represents a source dataset referenced from a lineage entry.
|
|
259
|
+
*/
|
|
260
|
+
export interface SourceRecord {
|
|
261
|
+
uuid?: string
|
|
262
|
+
title?: string
|
|
263
|
+
href?: string
|
|
264
|
+
}
|
|
265
|
+
|
|
257
266
|
export interface DatasetRecord extends BaseRecord {
|
|
258
267
|
kind: 'dataset'
|
|
259
268
|
status: RecordStatus
|
|
260
269
|
lineage: string // Explanation of the origin of this record (e.g: how, why)"
|
|
270
|
+
sourceRecords: Array<SourceRecord>
|
|
261
271
|
onlineResources: Array<DatasetOnlineResource>
|
|
262
272
|
spatialExtents: Array<DatasetSpatialExtent>
|
|
263
273
|
temporalExtents: Array<DatasetTemporalExtent>
|
|
@@ -285,6 +295,7 @@ export interface ServiceRecord extends BaseRecord {
|
|
|
285
295
|
export interface ReuseRecord extends BaseRecord {
|
|
286
296
|
kind: 'reuse'
|
|
287
297
|
lineage: string // Explanation of the origin of this record (e.g: how, why)"
|
|
298
|
+
sourceRecords: Array<SourceRecord>
|
|
288
299
|
onlineResources: Array<DatasetOnlineResource>
|
|
289
300
|
reuseType: ReuseType
|
|
290
301
|
spatialExtents: Array<DatasetSpatialExtent>
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Observable } from 'rxjs'
|
|
2
2
|
import type { UserModel } from './model/user/user.model'
|
|
3
|
+
import type { GroupModel } from './model/user/group.model'
|
|
3
4
|
import type { Organization } from './model/record/organization.model'
|
|
4
5
|
import { CatalogRecord, Keyword, UserFeedback } from './model/record'
|
|
5
6
|
import { KeywordType } from './model/thesaurus'
|
|
@@ -28,6 +29,7 @@ export abstract class PlatformServiceInterface {
|
|
|
28
29
|
abstract getMe(): Observable<UserModel>
|
|
29
30
|
abstract isAnonymous(): Observable<boolean>
|
|
30
31
|
abstract getUsers(): Observable<UserModel[]>
|
|
32
|
+
abstract getUserPermissionsByGroup(): Observable<GroupModel[]>
|
|
31
33
|
abstract getUsersByOrganization(
|
|
32
34
|
organisation: Organization
|
|
33
35
|
): Observable<UserModel[]>
|
|
@@ -134,6 +134,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
|
|
|
134
134
|
lineage: `This record was edited manually to test the conversion processes
|
|
135
135
|
|
|
136
136
|
As such, **it is not very interesting at all.**`,
|
|
137
|
+
sourceRecords: [],
|
|
137
138
|
licenses: [
|
|
138
139
|
{
|
|
139
140
|
text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
|
|
@@ -310,6 +311,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
|
|
|
310
311
|
],
|
|
311
312
|
lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
|
|
312
313
|
Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
|
|
314
|
+
sourceRecords: [],
|
|
313
315
|
legalConstraints: [],
|
|
314
316
|
securityConstraints: [],
|
|
315
317
|
otherConstraints: [],
|
|
@@ -361,6 +363,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
|
|
|
361
363
|
overviews: [],
|
|
362
364
|
spatialExtents: [],
|
|
363
365
|
temporalExtents: [],
|
|
366
|
+
sourceRecords: [],
|
|
364
367
|
onlineResources: [
|
|
365
368
|
{
|
|
366
369
|
type: 'download',
|
|
@@ -413,6 +416,7 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
|
|
|
413
416
|
overviews: [],
|
|
414
417
|
spatialExtents: [],
|
|
415
418
|
temporalExtents: [],
|
|
419
|
+
sourceRecords: [],
|
|
416
420
|
onlineResources: [],
|
|
417
421
|
updateFrequency: { per: 'month', updatedTimes: 3 },
|
|
418
422
|
translations: {},
|
|
@@ -978,6 +982,7 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
|
|
|
978
982
|
title: 'English Title',
|
|
979
983
|
abstract: 'English Abstract',
|
|
980
984
|
lineage: 'English Lineage',
|
|
985
|
+
sourceRecords: [],
|
|
981
986
|
translations: {
|
|
982
987
|
title: { fr: 'Titre Français', de: 'Titel DE' },
|
|
983
988
|
abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createAction, props } from '@ngrx/store'
|
|
2
2
|
import {
|
|
3
3
|
CatalogRecord,
|
|
4
|
+
CatalogRecordKeys,
|
|
4
5
|
LanguageCode,
|
|
5
6
|
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
6
7
|
import { SaveRecordError } from './editor.models'
|
|
@@ -73,3 +74,8 @@ export const canEditRecord = createAction(
|
|
|
73
74
|
'[Editor] User can edit record',
|
|
74
75
|
props<{ canEditRecord: boolean }>()
|
|
75
76
|
)
|
|
77
|
+
|
|
78
|
+
export const setFocusedField = createAction(
|
|
79
|
+
'[Editor] Set focused field',
|
|
80
|
+
props<{ model: CatalogRecordKeys }>()
|
|
81
|
+
)
|
|
@@ -4,9 +4,10 @@ import * as EditorActions from './editor.actions'
|
|
|
4
4
|
import * as EditorSelectors from './editor.selectors'
|
|
5
5
|
import {
|
|
6
6
|
CatalogRecord,
|
|
7
|
+
CatalogRecordKeys,
|
|
7
8
|
LanguageCode,
|
|
8
9
|
} from '../../../../../../libs/common/domain/src/lib/model/record'
|
|
9
|
-
import { filter } from 'rxjs'
|
|
10
|
+
import { filter, map } from 'rxjs'
|
|
10
11
|
import { Actions, ofType } from '@ngrx/effects'
|
|
11
12
|
import { EditorConfig, EditorFieldIdentification } from '../models'
|
|
12
13
|
|
|
@@ -37,6 +38,10 @@ export class EditorFacade {
|
|
|
37
38
|
)
|
|
38
39
|
isPublished$ = this.store.pipe(select(EditorSelectors.selectIsPublished))
|
|
39
40
|
canEditRecord$ = this.store.pipe(select(EditorSelectors.selectCanEditRecord))
|
|
41
|
+
focusedField$ = this.actions$.pipe(
|
|
42
|
+
ofType(EditorActions.setFocusedField),
|
|
43
|
+
map(({ model }) => model)
|
|
44
|
+
)
|
|
40
45
|
|
|
41
46
|
openRecord(record: CatalogRecord, recordSource: string) {
|
|
42
47
|
this.store.dispatch(
|
|
@@ -77,6 +82,10 @@ export class EditorFacade {
|
|
|
77
82
|
this.store.dispatch(EditorActions.setCurrentPage({ page }))
|
|
78
83
|
}
|
|
79
84
|
|
|
85
|
+
setFocusedField(model: CatalogRecordKeys) {
|
|
86
|
+
this.store.dispatch(EditorActions.setFocusedField({ model }))
|
|
87
|
+
}
|
|
88
|
+
|
|
80
89
|
setFieldVisibility(field: EditorFieldIdentification, visible: boolean) {
|
|
81
90
|
this.store.dispatch(EditorActions.setFieldVisibility({ field, visible }))
|
|
82
91
|
}
|
|
File without changes
|