geonetwork-ui 2.10.0-dev.b6696be21 → 2.10.0-dev.bfea85a63
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 +1016 -6093
- package/fesm2022/geonetwork-ui.mjs.map +1 -1
- package/index.d.ts +144 -149
- package/index.d.ts.map +1 -1
- package/package.json +23 -33
- package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts +48 -7
- package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +5 -4
- package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts +2 -2
- package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts +1 -0
- package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts +4 -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 +5 -5
- 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 +2 -2
- package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +2 -0
- package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts +2 -1
- package/src/libs/common/fixtures/src/lib/records.fixtures.ts +51 -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 +4 -1
- package/src/libs/feature/editor/src/lib/+state/editor.effects.ts +26 -19
- package/src/libs/feature/editor/src/lib/+state/editor.facade.ts +5 -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/generic-keywords/generic-keywords.component.html +5 -14
- package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts +3 -28
- package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.html +5 -5
- package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.ts +2 -1
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/field-focus.directive.ts +4 -1
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-constraints-shortcuts/form-field-constraints-shortcuts.component.ts +7 -7
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-resources/form-field-online-resources.component.ts +1 -1
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-overviews/form-field-overviews.component.ts +12 -5
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-rich/form-field-rich.component.html +4 -4
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-rich/form-field-rich.component.ts +7 -0
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-update-frequency/form-field-update-frequency.component.html +6 -2
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-update-frequency/form-field-update-frequency.component.ts +3 -1
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.css +0 -34
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html +20 -16
- package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts +9 -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 +18 -5
- package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts +76 -19
- package/src/libs/feature/editor/src/lib/expressions.ts +380 -8
- package/src/libs/feature/editor/src/lib/fields.config.ts +251 -290
- package/src/libs/feature/editor/src/lib/models/editor-config.model.ts +2 -3
- package/src/libs/feature/editor/src/lib/services/editor.service.ts +8 -12
- package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +33 -0
- package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +9 -1
- package/src/libs/feature/search/src/lib/results-table/results-table-container.component.ts +10 -5
- 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 +1 -0
- package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.html +48 -56
- package/src/libs/ui/elements/src/lib/external-link-card/external-link-card.component.html +2 -1
- package/src/libs/ui/elements/src/lib/external-link-card/external-link-card.component.ts +2 -2
- 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/keyword-badge/keyword-badge.component.html +14 -0
- package/src/libs/ui/elements/src/lib/keyword-badge/keyword-badge.component.ts +85 -0
- package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts +2 -2
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css +5 -0
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +4 -7
- package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +2 -2
- package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html +4 -5
- package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts +4 -0
- package/src/libs/ui/inputs/src/lib/badge/badge.component.html +33 -26
- package/src/libs/ui/inputs/src/lib/badge/badge.component.ts +9 -0
- package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts +2 -2
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html +1 -1
- package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.ts +3 -3
- package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.html +5 -5
- package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.ts +9 -1
- package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html +1 -1
- package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.ts +3 -8
- package/src/libs/ui/layout/src/lib/sortable-list/sortable-list.component.html +7 -7
- package/src/libs/ui/layout/src/lib/sortable-list/sortable-list.component.ts +14 -1
- package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts +4 -54
- 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/ui/search/src/lib/results-table/action-menu/action-menu.component.html +12 -8
- package/src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.ts +3 -1
- package/src/libs/ui/search/src/lib/results-table/results-table.component.html +1 -0
- package/src/libs/ui/widgets/src/lib/popover/popover.component.ts +7 -1
- package/src/libs/util/app-config/src/lib/app-config.ts +21 -9
- 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 +22 -0
- 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/style.css +0 -1
- package/tailwind.base.css +9 -0
- package/translations/de.json +53 -29
- package/translations/en.json +58 -34
- package/translations/es.json +27 -3
- package/translations/fr.json +55 -31
- package/translations/it.json +53 -29
- package/translations/nl.json +26 -2
- package/translations/pt.json +27 -3
- package/translations/sk.json +27 -3
- package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.css +0 -3
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { inject, Injectable } from '@angular/core'
|
|
2
2
|
import { Configuration } from '../../../../../../libs/data-access/gn4/src'
|
|
3
3
|
import { TranslateService } from '@ngx-translate/core'
|
|
4
4
|
import { toLang3 } from '../../../../../../libs/util/i18n/src'
|
|
@@ -13,7 +13,7 @@ export class MetadataUrlService {
|
|
|
13
13
|
getUrl(uuid: string, apiPath: string = this.apiConfiguration.basePath) {
|
|
14
14
|
const prefix = `${apiPath}/../`
|
|
15
15
|
return `${prefix}${toLang3(
|
|
16
|
-
this.translate.
|
|
16
|
+
this.translate.getCurrentLang()
|
|
17
17
|
)}/catalog.search#/metadata/${uuid}`
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable, InjectionToken
|
|
1
|
+
import { inject, Injectable, InjectionToken } from '@angular/core'
|
|
2
2
|
import { toLang2, toLang3 } from '../../../../../../../libs/util/i18n/src'
|
|
3
3
|
import { TranslateService } from '@ngx-translate/core'
|
|
4
4
|
import { Location } from '@angular/common'
|
|
@@ -48,8 +48,8 @@ export class AuthService {
|
|
|
48
48
|
'${current_path}',
|
|
49
49
|
this.location.prepareExternalUrl(this.location.path())
|
|
50
50
|
)
|
|
51
|
-
.replace('${lang2}', toLang2(this.translateService.
|
|
52
|
-
.replace('${lang3}', toLang3(this.translateService.
|
|
51
|
+
.replace('${lang2}', toLang2(this.translateService.getCurrentLang()))
|
|
52
|
+
.replace('${lang3}', toLang3(this.translateService.getCurrentLang()))
|
|
53
53
|
}
|
|
54
54
|
|
|
55
55
|
get logoutUrl() {
|
|
@@ -59,7 +59,7 @@ export class AuthService {
|
|
|
59
59
|
get settingsUrl() {
|
|
60
60
|
return this.baseSettingsUrl.replace(
|
|
61
61
|
'${lang3}',
|
|
62
|
-
toLang3(this.translateService.
|
|
62
|
+
toLang3(this.translateService.getCurrentLang())
|
|
63
63
|
)
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable, Injector
|
|
1
|
+
import { inject, Injectable, Injector } from '@angular/core'
|
|
2
2
|
import type { Geometry } from 'geojson'
|
|
3
3
|
import {
|
|
4
4
|
ES_QUERY_FIELDS_PRIORITY,
|
|
@@ -234,7 +234,7 @@ export class ElasticsearchService {
|
|
|
234
234
|
if (this.metadataLang) {
|
|
235
235
|
const lang3 = toLang3(
|
|
236
236
|
this.isCurrentSearchLang()
|
|
237
|
-
? this.translateService.
|
|
237
|
+
? this.translateService.getCurrentLang()
|
|
238
238
|
: this.metadataLang
|
|
239
239
|
)
|
|
240
240
|
return `lang${lang3}`
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
HttpErrorResponse,
|
|
4
4
|
HttpHeaders,
|
|
5
5
|
} from '@angular/common/http'
|
|
6
|
-
import { Injectable, InjectionToken
|
|
6
|
+
import { inject, Injectable, InjectionToken } from '@angular/core'
|
|
7
7
|
import {
|
|
8
8
|
assertValidXml,
|
|
9
9
|
BaseConverter,
|
|
@@ -336,10 +336,10 @@ export class Gn4Repository implements RecordsRepositoryInterface {
|
|
|
336
336
|
|
|
337
337
|
private canEdit(record: CatalogRecord, allowEditHarvested: boolean): boolean {
|
|
338
338
|
return (
|
|
339
|
-
this.platformService.supportsAuthentication() &&
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
339
|
+
(this.platformService.supportsAuthentication() &&
|
|
340
|
+
record.extras?.['edit'] &&
|
|
341
|
+
(!record.extras?.['isHarvested'] || allowEditHarvested)) ??
|
|
342
|
+
false
|
|
343
343
|
)
|
|
344
344
|
}
|
|
345
345
|
|
package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts
CHANGED
|
@@ -52,7 +52,7 @@ export class OrganizationsFromGroupsService
|
|
|
52
52
|
organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
|
|
53
53
|
|
|
54
54
|
private get lang3() {
|
|
55
|
-
return toLang3(this.translateService.
|
|
55
|
+
return toLang3(this.translateService.getCurrentLang())
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
constructor(
|
package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts
CHANGED
|
@@ -128,7 +128,7 @@ export class OrganizationsFromMetadataService
|
|
|
128
128
|
) {}
|
|
129
129
|
|
|
130
130
|
private get langIndex() {
|
|
131
|
-
return `lang${toLang3(this.translateService.
|
|
131
|
+
return `lang${toLang3(this.translateService.getCurrentLang())}`
|
|
132
132
|
}
|
|
133
133
|
|
|
134
134
|
equalsNormalizedStrings(
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { HttpClient, HttpEventType } from '@angular/common/http'
|
|
2
|
-
import { Injectable, InjectionToken
|
|
2
|
+
import { inject, Injectable, InjectionToken } from '@angular/core'
|
|
3
3
|
import {
|
|
4
4
|
KeywordApiResponse,
|
|
5
5
|
ThesaurusApiResponse,
|
|
@@ -100,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
|
|
|
100
100
|
private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
|
|
101
101
|
|
|
102
102
|
private get lang3() {
|
|
103
|
-
return toLang3(this.translateService.
|
|
103
|
+
return toLang3(this.translateService.getCurrentLang())
|
|
104
104
|
}
|
|
105
105
|
|
|
106
106
|
constructor() {
|
|
@@ -104,6 +104,8 @@ export interface Keyword {
|
|
|
104
104
|
type: KeywordType
|
|
105
105
|
thesaurus?: ThesaurusModel
|
|
106
106
|
bbox?: [number, number, number, number]
|
|
107
|
+
// thesaurus hierarchy path incl. the keyword as last element; unset for root-level keywords
|
|
108
|
+
hierarchyPath?: string[]
|
|
107
109
|
|
|
108
110
|
translations?: KeywordTranslations
|
|
109
111
|
}
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
DatasetRecord,
|
|
4
4
|
DatasetSpatialExtent,
|
|
5
5
|
Keyword,
|
|
6
|
+
ReuseRecord,
|
|
6
7
|
ServiceRecord,
|
|
7
8
|
} from '../../../../../libs/common/domain/src/lib/model/record'
|
|
8
9
|
|
|
@@ -1027,3 +1028,53 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
|
|
|
1027
1028
|
topics: [],
|
|
1028
1029
|
recordUpdated: null,
|
|
1029
1030
|
})
|
|
1031
|
+
|
|
1032
|
+
export const simpleReuseRecordFixture = (): ReuseRecord => ({
|
|
1033
|
+
abstract: `Sample reuse record`,
|
|
1034
|
+
kind: 'reuse',
|
|
1035
|
+
reuseType: 'application',
|
|
1036
|
+
recordUpdated: new Date('2023-03-17T07:38:08.875Z'),
|
|
1037
|
+
recordPublished: null,
|
|
1038
|
+
ownerOrganization: null,
|
|
1039
|
+
licenses: [],
|
|
1040
|
+
legalConstraints: [],
|
|
1041
|
+
securityConstraints: [],
|
|
1042
|
+
otherConstraints: [],
|
|
1043
|
+
contacts: [],
|
|
1044
|
+
contactsForResource: [],
|
|
1045
|
+
keywords: [],
|
|
1046
|
+
topics: [],
|
|
1047
|
+
spatialExtents: [],
|
|
1048
|
+
temporalExtents: [],
|
|
1049
|
+
lineage: 'bla',
|
|
1050
|
+
sourceRecords: [],
|
|
1051
|
+
overviews: [],
|
|
1052
|
+
defaultLanguage: null,
|
|
1053
|
+
otherLanguages: [],
|
|
1054
|
+
title: 'Sites de gestion des déchets miniers - Service de visualisation WMS',
|
|
1055
|
+
onlineResources: [
|
|
1056
|
+
{
|
|
1057
|
+
name: 'Rapport de disponibilité du service WMS',
|
|
1058
|
+
description:
|
|
1059
|
+
'Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".',
|
|
1060
|
+
mimeType: 'text/html',
|
|
1061
|
+
type: 'link',
|
|
1062
|
+
url: new URL(
|
|
1063
|
+
'https://geoservices.wallonie.be/rapportDisponibilite/wms/sites_de_gestion_des_dechets_miniers_srie.html'
|
|
1064
|
+
),
|
|
1065
|
+
accessRestricted: false,
|
|
1066
|
+
},
|
|
1067
|
+
],
|
|
1068
|
+
uniqueIdentifier: '00b22798-ec8e-4500-89e8-90eeeda45919',
|
|
1069
|
+
landingPage: new URL(
|
|
1070
|
+
'http://localhost:4200/geonetwork/srv/fre/catalog.search#/metadata/00b22798-ec8e-4500-89e8-90eeeda45919'
|
|
1071
|
+
),
|
|
1072
|
+
extras: {
|
|
1073
|
+
isPublishedToAll: true,
|
|
1074
|
+
id: '723',
|
|
1075
|
+
isHarvested: true,
|
|
1076
|
+
ownerInfo: 'admin|admin|admin|Administrator',
|
|
1077
|
+
edit: true,
|
|
1078
|
+
},
|
|
1079
|
+
recordCreated: new Date('2023-03-17T07:38:08.875Z'),
|
|
1080
|
+
})
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { inject, Injectable } from '@angular/core'
|
|
2
2
|
import { SourcesApiService } from '../../../../../../libs/data-access/gn4/src'
|
|
3
3
|
import { Observable } from 'rxjs'
|
|
4
4
|
import { filter, map, shareReplay } from 'rxjs/operators'
|
|
@@ -21,7 +21,10 @@ export class SourcesService {
|
|
|
21
21
|
return this.sources$.pipe(
|
|
22
22
|
map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
|
|
23
23
|
filter((source) => !!source),
|
|
24
|
-
map(
|
|
24
|
+
map(
|
|
25
|
+
(source) =>
|
|
26
|
+
source.label[toLang3(this.translateService.getCurrentLang())]
|
|
27
|
+
)
|
|
25
28
|
)
|
|
26
29
|
}
|
|
27
30
|
}
|
|
@@ -29,7 +29,10 @@ export const markRecordAsChanged = createAction(
|
|
|
29
29
|
'[Editor] Mark record as changed'
|
|
30
30
|
)
|
|
31
31
|
|
|
32
|
-
export const saveRecord = createAction(
|
|
32
|
+
export const saveRecord = createAction(
|
|
33
|
+
'[Editor] Save record',
|
|
34
|
+
props<{ publish: boolean }>()
|
|
35
|
+
)
|
|
33
36
|
export const saveRecordSuccess = createAction('[Editor] Save record success')
|
|
34
37
|
export const saveRecordFailure = createAction(
|
|
35
38
|
'[Editor] Save record failure',
|
|
@@ -28,30 +28,37 @@ export class EditorEffects {
|
|
|
28
28
|
this.store.select(selectRecordSource),
|
|
29
29
|
this.store.select(selectEditorConfig)
|
|
30
30
|
),
|
|
31
|
-
switchMap(([, record, recordSource, fieldsConfig]) =>
|
|
32
|
-
this.editorService
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
switchMap(([{ publish }, record, recordSource, fieldsConfig]) =>
|
|
32
|
+
this.editorService
|
|
33
|
+
.saveRecord(record, recordSource, fieldsConfig, publish)
|
|
34
|
+
.pipe(
|
|
35
|
+
switchMap(([savedRecord, savedRecordSource]) => {
|
|
36
|
+
const actions: Action[] = [EditorActions.saveRecordSuccess()]
|
|
37
|
+
|
|
38
|
+
if (publish) {
|
|
39
|
+
// saving without publishing doesn't unpublish
|
|
40
|
+
actions.push(EditorActions.isPublished({ isPublished: true }))
|
|
41
|
+
}
|
|
35
42
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
if (!record?.uniqueIdentifier) {
|
|
44
|
+
actions.push(
|
|
45
|
+
EditorActions.openRecord({
|
|
46
|
+
record: savedRecord,
|
|
47
|
+
recordSource: savedRecordSource,
|
|
48
|
+
})
|
|
49
|
+
)
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return of(...actions)
|
|
53
|
+
}),
|
|
54
|
+
catchError((error) =>
|
|
55
|
+
of(
|
|
56
|
+
EditorActions.saveRecordFailure({
|
|
57
|
+
error,
|
|
41
58
|
})
|
|
42
59
|
)
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
return of(...actions)
|
|
46
|
-
}),
|
|
47
|
-
catchError((error) =>
|
|
48
|
-
of(
|
|
49
|
-
EditorActions.saveRecordFailure({
|
|
50
|
-
error,
|
|
51
|
-
})
|
|
52
60
|
)
|
|
53
61
|
)
|
|
54
|
-
)
|
|
55
62
|
)
|
|
56
63
|
)
|
|
57
64
|
)
|
|
@@ -54,7 +54,11 @@ export class EditorFacade {
|
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
saveRecord() {
|
|
57
|
-
this.store.dispatch(EditorActions.saveRecord())
|
|
57
|
+
this.store.dispatch(EditorActions.saveRecord({ publish: false }))
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
saveAndPublishRecord() {
|
|
61
|
+
this.store.dispatch(EditorActions.saveRecord({ publish: true }))
|
|
58
62
|
}
|
|
59
63
|
|
|
60
64
|
undoRecordDraft() {
|
package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts
CHANGED
|
@@ -8,7 +8,6 @@ import {
|
|
|
8
8
|
|
|
9
9
|
import { FormFieldRichComponent } from '../record-form/form-field/form-field-rich/form-field-rich.component'
|
|
10
10
|
import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
|
|
11
|
-
import { MatIconModule } from '@angular/material/icon'
|
|
12
11
|
import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
|
|
13
12
|
import { Constraint } from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
14
13
|
import {
|
|
@@ -26,7 +25,6 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
|
|
|
26
25
|
FormFieldRichComponent,
|
|
27
26
|
UrlInputComponent,
|
|
28
27
|
ButtonComponent,
|
|
29
|
-
MatIconModule,
|
|
30
28
|
TranslateDirective,
|
|
31
29
|
TranslatePipe,
|
|
32
30
|
NgIconComponent,
|
package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.html
CHANGED
|
@@ -11,20 +11,11 @@
|
|
|
11
11
|
></gn-ui-autocomplete>
|
|
12
12
|
<div class="flex gap-2 flex-wrap">
|
|
13
13
|
@for (keyword of keywords; track keyword) {
|
|
14
|
-
<gn-ui-badge
|
|
15
|
-
[
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
<ng-icon
|
|
20
|
-
[title]="
|
|
21
|
-
'editor.record.form.keywords.place.withoutExtent' | translate
|
|
22
|
-
"
|
|
23
|
-
class="badge-warning"
|
|
24
|
-
name="matWarningAmberOutline"
|
|
25
|
-
></ng-icon>
|
|
26
|
-
}
|
|
27
|
-
</gn-ui-badge>
|
|
14
|
+
<gn-ui-keyword-badge
|
|
15
|
+
[keyword]="keyword"
|
|
16
|
+
[editable]="true"
|
|
17
|
+
(keywordRemove)="removeKeyword($event)"
|
|
18
|
+
></gn-ui-keyword-badge>
|
|
28
19
|
}
|
|
29
20
|
</div>
|
|
30
21
|
</div>
|
package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts
CHANGED
|
@@ -7,40 +7,20 @@ import {
|
|
|
7
7
|
inject,
|
|
8
8
|
} from '@angular/core'
|
|
9
9
|
import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
10
|
-
import { AutocompleteComponent
|
|
10
|
+
import { AutocompleteComponent } from '../../../../../../../libs/ui/inputs/src'
|
|
11
|
+
import { KeywordBadgeComponent } from '../../../../../../../libs/ui/elements/src'
|
|
11
12
|
import { map } from 'rxjs'
|
|
12
13
|
import { Keyword } from '../../../../../../../libs/common/domain/src/lib/model/record'
|
|
13
14
|
import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
|
|
14
|
-
import { TranslatePipe } from '@ngx-translate/core'
|
|
15
|
-
import {
|
|
16
|
-
NgIconComponent,
|
|
17
|
-
provideIcons,
|
|
18
|
-
provideNgIconsConfig,
|
|
19
|
-
} from '@ng-icons/core'
|
|
20
|
-
import { matWarningAmberOutline } from '@ng-icons/material-icons/outline'
|
|
21
15
|
|
|
22
16
|
type AutocompleteItem = { title: string; value: Keyword }
|
|
23
17
|
|
|
24
18
|
@Component({
|
|
25
19
|
selector: 'gn-ui-generic-keywords',
|
|
26
20
|
templateUrl: './generic-keywords.component.html',
|
|
27
|
-
styleUrls: ['./generic-keywords.component.css'],
|
|
28
21
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
|
29
22
|
standalone: true,
|
|
30
|
-
imports: [
|
|
31
|
-
AutocompleteComponent,
|
|
32
|
-
NgIconComponent,
|
|
33
|
-
BadgeComponent,
|
|
34
|
-
TranslatePipe,
|
|
35
|
-
],
|
|
36
|
-
providers: [
|
|
37
|
-
provideIcons({
|
|
38
|
-
matWarningAmberOutline,
|
|
39
|
-
}),
|
|
40
|
-
provideNgIconsConfig({
|
|
41
|
-
size: '1.5em',
|
|
42
|
-
}),
|
|
43
|
-
],
|
|
23
|
+
imports: [AutocompleteComponent, KeywordBadgeComponent],
|
|
44
24
|
})
|
|
45
25
|
export class GenericKeywordsComponent {
|
|
46
26
|
private platformService = inject(PlatformServiceInterface)
|
|
@@ -87,9 +67,4 @@ export class GenericKeywordsComponent {
|
|
|
87
67
|
this.changedKeywords.emit(this.keywords)
|
|
88
68
|
this.deletedKeyword.emit(keyword)
|
|
89
69
|
}
|
|
90
|
-
|
|
91
|
-
isPlaceWithoutExtent(keyword: Keyword): boolean {
|
|
92
|
-
if (keyword.type !== 'place') return false
|
|
93
|
-
return !keyword.bbox
|
|
94
|
-
}
|
|
95
70
|
}
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
editor.record.form.field.onlineResource.edit.protocol
|
|
4
4
|
</h3>
|
|
5
5
|
@if (protocolHint) {
|
|
6
|
-
<
|
|
7
|
-
|
|
6
|
+
<ng-icon
|
|
7
|
+
name="matHelpOutline"
|
|
8
|
+
size="16"
|
|
9
|
+
class="m-2"
|
|
8
10
|
[matTooltip]="protocolHint"
|
|
9
11
|
matTooltipPosition="above"
|
|
10
|
-
>
|
|
11
|
-
help
|
|
12
|
-
</span>
|
|
12
|
+
></ng-icon>
|
|
13
13
|
}
|
|
14
14
|
</div>
|
|
15
15
|
<div class="flex flex-row items-center gap-4 h-[48px]">
|
|
@@ -30,6 +30,7 @@ import {
|
|
|
30
30
|
provideNgIconsConfig,
|
|
31
31
|
} from '@ng-icons/core'
|
|
32
32
|
import { iconoirRefresh } from '@ng-icons/iconoir'
|
|
33
|
+
import { matHelpOutline } from '@ng-icons/material-icons/outline'
|
|
33
34
|
import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
|
|
34
35
|
import {
|
|
35
36
|
BehaviorSubject,
|
|
@@ -65,7 +66,7 @@ marker(
|
|
|
65
66
|
UrlInputComponent,
|
|
66
67
|
],
|
|
67
68
|
providers: [
|
|
68
|
-
provideIcons({ iconoirRefresh }),
|
|
69
|
+
provideIcons({ iconoirRefresh, matHelpOutline }),
|
|
69
70
|
provideNgIconsConfig({
|
|
70
71
|
size: '1.5em',
|
|
71
72
|
}),
|
package/src/libs/feature/editor/src/lib/components/record-form/form-field/field-focus.directive.ts
CHANGED
|
@@ -10,7 +10,7 @@ export class FieldFocusDirective {
|
|
|
10
10
|
|
|
11
11
|
private el = inject(ElementRef)
|
|
12
12
|
|
|
13
|
-
public focusField() {
|
|
13
|
+
public focusField(focusInnerTarget = true) {
|
|
14
14
|
setTimeout(() => {
|
|
15
15
|
const host = this.el.nativeElement as HTMLElement
|
|
16
16
|
const glowClass = this.gnUiFieldFocusGlowClass
|
|
@@ -25,6 +25,9 @@ export class FieldFocusDirective {
|
|
|
25
25
|
)
|
|
26
26
|
|
|
27
27
|
host.scrollIntoView({ behavior: 'smooth', block: 'start' })
|
|
28
|
+
if (!focusInnerTarget) {
|
|
29
|
+
return
|
|
30
|
+
}
|
|
28
31
|
const target =
|
|
29
32
|
host.querySelector<HTMLElement>(
|
|
30
33
|
'input, textarea, select, [contenteditable="true"]'
|
|
@@ -131,14 +131,14 @@ export class FormFieldConstraintsShortcutsComponent implements OnDestroy {
|
|
|
131
131
|
map((c) => c.length > 0),
|
|
132
132
|
distinctUntilChanged()
|
|
133
133
|
)
|
|
134
|
-
combineLatest([
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
})
|
|
134
|
+
combineLatest([isConstraintNotEmpty$, this.anyToggleActivated$])
|
|
135
|
+
.pipe(takeUntil(this.onDestroy$))
|
|
136
|
+
.subscribe(([isNotEmpty, anyToggleActivated]) => {
|
|
137
|
+
const visible = isNotEmpty && !anyToggleActivated
|
|
138
|
+
this.editorFacade.setFieldVisibility({ model }, visible)
|
|
139
|
+
})
|
|
141
140
|
}
|
|
141
|
+
hideEmptyConstraints(this.legalConstraints$, 'legalConstraints')
|
|
142
142
|
hideEmptyConstraints(this.securityConstraints$, 'securityConstraints')
|
|
143
143
|
hideEmptyConstraints(this.otherConstraints$, 'otherConstraints')
|
|
144
144
|
})
|
|
@@ -3,11 +3,11 @@ import {
|
|
|
3
3
|
ChangeDetectorRef,
|
|
4
4
|
Component,
|
|
5
5
|
EventEmitter,
|
|
6
|
+
inject,
|
|
6
7
|
Input,
|
|
7
8
|
Output,
|
|
8
9
|
TemplateRef,
|
|
9
10
|
ViewChild,
|
|
10
|
-
inject,
|
|
11
11
|
} from '@angular/core'
|
|
12
12
|
import { MatDialog } from '@angular/material/dialog'
|
|
13
13
|
import { marker } from '@biesbjerg/ngx-translate-extract-marker'
|
|
@@ -3,11 +3,14 @@ import {
|
|
|
3
3
|
ChangeDetectorRef,
|
|
4
4
|
Component,
|
|
5
5
|
EventEmitter,
|
|
6
|
+
inject,
|
|
6
7
|
Input,
|
|
7
8
|
Output,
|
|
8
|
-
inject,
|
|
9
9
|
} from '@angular/core'
|
|
10
|
-
import {
|
|
10
|
+
import {
|
|
11
|
+
GraphicOverview,
|
|
12
|
+
RecordKind,
|
|
13
|
+
} from '../../../../../../../../../libs/common/domain/src/lib/model/record'
|
|
11
14
|
import { ImageInputComponent } from '../../../../../../../../../libs/ui/elements/src'
|
|
12
15
|
import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
|
|
13
16
|
import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
|
|
@@ -30,6 +33,7 @@ export class FormFieldOverviewsComponent {
|
|
|
30
33
|
private cd = inject(ChangeDetectorRef)
|
|
31
34
|
|
|
32
35
|
@Input() metadataUuid: string
|
|
36
|
+
@Input() recordKind: RecordKind
|
|
33
37
|
@Input() value: Array<GraphicOverview>
|
|
34
38
|
@Output() valueChange: EventEmitter<Array<GraphicOverview>> =
|
|
35
39
|
new EventEmitter()
|
|
@@ -111,13 +115,16 @@ export class FormFieldOverviewsComponent {
|
|
|
111
115
|
{
|
|
112
116
|
type: 'error',
|
|
113
117
|
title: this.translateService.instant(
|
|
114
|
-
'editor.record.resourceError.title'
|
|
118
|
+
'editor.record.resourceError.title',
|
|
119
|
+
{ recordKind: this.recordKind }
|
|
115
120
|
),
|
|
116
121
|
text: `${this.translateService.instant(
|
|
117
|
-
'editor.record.resourceError.body'
|
|
122
|
+
'editor.record.resourceError.body',
|
|
123
|
+
{ recordKind: this.recordKind }
|
|
118
124
|
)} ${error.message}`,
|
|
119
125
|
closeMessage: this.translateService.instant(
|
|
120
|
-
'editor.record.resourceError.closeMessage'
|
|
126
|
+
'editor.record.resourceError.closeMessage',
|
|
127
|
+
{ recordKind: this.recordKind }
|
|
121
128
|
),
|
|
122
129
|
},
|
|
123
130
|
undefined,
|
|
@@ -9,11 +9,11 @@
|
|
|
9
9
|
"
|
|
10
10
|
(buttonClick)="togglePreview()"
|
|
11
11
|
>
|
|
12
|
-
<
|
|
13
|
-
|
|
12
|
+
<ng-icon
|
|
13
|
+
[name]="preview ? 'matVisibilityOffOutline' : 'matVisibilityOutline'"
|
|
14
|
+
size="16"
|
|
14
15
|
[ngClass]="{ 'text-primary': !preview }"
|
|
15
|
-
|
|
16
|
-
>
|
|
16
|
+
></ng-icon>
|
|
17
17
|
|
|
18
18
|
{{ preview ? 'Edit' : 'Preview' }}
|
|
19
19
|
</gn-ui-button>
|
|
@@ -10,6 +10,11 @@ import { ReactiveFormsModule } from '@angular/forms'
|
|
|
10
10
|
import { MarkdownEditorComponent } from '../../../../../../../../../libs/ui/elements/src'
|
|
11
11
|
import { ButtonComponent } from '../../../../../../../../../libs/ui/inputs/src'
|
|
12
12
|
import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/layout/src'
|
|
13
|
+
import { NgIconComponent, provideIcons } from '@ng-icons/core'
|
|
14
|
+
import {
|
|
15
|
+
matVisibilityOffOutline,
|
|
16
|
+
matVisibilityOutline,
|
|
17
|
+
} from '@ng-icons/material-icons/outline'
|
|
13
18
|
|
|
14
19
|
@Component({
|
|
15
20
|
selector: 'gn-ui-form-field-rich',
|
|
@@ -23,7 +28,9 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
|
|
|
23
28
|
MarkdownEditorComponent,
|
|
24
29
|
FormFieldWrapperComponent,
|
|
25
30
|
ButtonComponent,
|
|
31
|
+
NgIconComponent,
|
|
26
32
|
],
|
|
33
|
+
providers: [provideIcons({ matVisibilityOutline, matVisibilityOffOutline })],
|
|
27
34
|
})
|
|
28
35
|
export class FormFieldRichComponent {
|
|
29
36
|
@Input() label: string
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
<div class="flex flex-col gap-2">
|
|
2
2
|
<gn-ui-check-toggle
|
|
3
|
-
[label]="
|
|
3
|
+
[label]="
|
|
4
|
+
'editor.record.form.updateFrequency.planned' | translate: { recordKind }
|
|
5
|
+
"
|
|
4
6
|
[value]="planned"
|
|
5
7
|
(toggled)="onPlannedToggled()"
|
|
6
8
|
></gn-ui-check-toggle>
|
|
7
9
|
<gn-ui-dropdown-selector
|
|
8
|
-
[title]="
|
|
10
|
+
[title]="
|
|
11
|
+
'editor.record.form.field.updateFrequency' | translate: { recordKind }
|
|
12
|
+
"
|
|
9
13
|
[showTitle]="false"
|
|
10
14
|
[choices]="choices"
|
|
11
15
|
[selected]="selectedFrequency"
|
|
@@ -2,12 +2,13 @@ import {
|
|
|
2
2
|
ChangeDetectionStrategy,
|
|
3
3
|
Component,
|
|
4
4
|
EventEmitter,
|
|
5
|
+
inject,
|
|
5
6
|
Input,
|
|
6
7
|
OnInit,
|
|
7
8
|
Output,
|
|
8
|
-
inject,
|
|
9
9
|
} from '@angular/core'
|
|
10
10
|
import {
|
|
11
|
+
RecordKind,
|
|
11
12
|
UpdateFrequency,
|
|
12
13
|
UpdateFrequencyCode,
|
|
13
14
|
updateFrequencyCodeValues,
|
|
@@ -37,6 +38,7 @@ export class FormFieldUpdateFrequencyComponent implements OnInit {
|
|
|
37
38
|
private translateService = inject(TranslateService)
|
|
38
39
|
|
|
39
40
|
@Input() value: UpdateFrequency
|
|
41
|
+
@Input() recordKind: RecordKind
|
|
40
42
|
@Output() valueChange: EventEmitter<UpdateFrequency> = new EventEmitter()
|
|
41
43
|
|
|
42
44
|
protected choices: DropdownChoice[] = []
|