geonetwork-ui 2.10.0-dev.dc713c01a → 2.10.0-dev.e2dc4fd62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (133) hide show
  1. package/fesm2022/geonetwork-ui.mjs +872 -5806
  2. package/fesm2022/geonetwork-ui.mjs.map +1 -1
  3. package/index.d.ts +212 -89
  4. package/index.d.ts.map +1 -1
  5. package/material-styles.css +483 -0
  6. package/package.json +25 -35
  7. package/src/libs/api/metadata-converter/src/lib/dcat-ap/dcat-ap.converter.ts +9 -0
  8. package/src/libs/api/metadata-converter/src/lib/fixtures/eu.dcat-ap.records.ts +2 -0
  9. package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts +1 -0
  10. package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.reuse+ongules.ts +7 -0
  11. package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.reuse+roilaye.ts +1 -0
  12. package/src/libs/api/metadata-converter/src/lib/fixtures/geo2france.records.ts +1 -0
  13. package/src/libs/api/metadata-converter/src/lib/fixtures/geocat-ch.records.ts +1 -0
  14. package/src/libs/api/metadata-converter/src/lib/fixtures/georhena.records.ts +1 -0
  15. package/src/libs/api/metadata-converter/src/lib/fixtures/metadata-for-i18n.records.ts +2 -0
  16. package/src/libs/api/metadata-converter/src/lib/fixtures/metawal.records.ts +1 -0
  17. package/src/libs/api/metadata-converter/src/lib/fixtures/opendataswiss.records.ts +1 -0
  18. package/src/libs/api/metadata-converter/src/lib/fixtures/sextant.records.ts +2 -0
  19. package/src/libs/api/metadata-converter/src/lib/fixtures/vlaanderen.dcat-ap.records.ts +1 -0
  20. package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.reuse.ts +8 -0
  21. package/src/libs/api/metadata-converter/src/lib/gn4/atomic-operations.ts +48 -7
  22. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.converter.ts +1 -0
  23. package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts +5 -4
  24. package/src/libs/api/metadata-converter/src/lib/gn4/metadata-url.service.ts +2 -2
  25. package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts +1 -0
  26. package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts +7 -0
  27. package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts +8 -0
  28. package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts +8 -0
  29. package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts +11 -0
  30. package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts +33 -0
  31. package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts +33 -0
  32. package/src/libs/api/repository/src/lib/gn4/auth/auth.service.ts +8 -4
  33. package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts +2 -2
  34. package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts +68 -34
  35. package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts +6 -1
  36. package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-groups.service.ts +1 -1
  37. package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts +1 -1
  38. package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts +48 -2
  39. package/src/libs/common/domain/src/lib/model/record/metadata.model.ts +13 -5
  40. package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts +2 -1
  41. package/src/libs/common/domain/src/lib/model/user/group.model.ts +8 -0
  42. package/src/libs/common/domain/src/lib/model/user/index.ts +1 -0
  43. package/src/libs/common/domain/src/lib/platform.service.interface.ts +2 -0
  44. package/src/libs/common/fixtures/src/lib/records.fixtures.ts +5 -0
  45. package/src/libs/feature/catalog/src/lib/sources/sources.service.ts +5 -2
  46. package/src/libs/feature/editor/src/lib/+state/editor.actions.ts +6 -0
  47. package/src/libs/feature/editor/src/lib/+state/editor.effects.ts +0 -1
  48. package/src/libs/feature/editor/src/lib/+state/editor.facade.ts +10 -1
  49. package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.ts +0 -2
  50. package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.css +0 -0
  51. package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.html +67 -0
  52. package/src/libs/feature/editor/src/lib/components/contact-details/contact-details-form.component.ts +39 -0
  53. package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.html +18 -3
  54. package/src/libs/feature/editor/src/lib/components/metadata-quality-panel/metadata-quality-panel.component.ts +33 -40
  55. package/src/libs/feature/editor/src/lib/components/record-form/form-field/field-focus.directive.ts +41 -0
  56. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-constraints-shortcuts/form-field-constraints-shortcuts.component.ts +32 -34
  57. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts/form-field-contacts.component.html +13 -13
  58. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts/form-field-contacts.component.ts +18 -4
  59. 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
  60. 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
  61. 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
  62. 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
  63. 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
  64. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-topics/form-field-topics.component.ts +2 -2
  65. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.css +3 -0
  66. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html +1 -0
  67. package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts +5 -0
  68. package/src/libs/feature/editor/src/lib/components/record-form/form-field/index.ts +1 -0
  69. package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.css +35 -0
  70. package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.html +5 -1
  71. package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts +77 -5
  72. package/src/libs/feature/editor/src/lib/fields.config.ts +60 -47
  73. package/src/libs/feature/editor/src/lib/models/editor-config.model.ts +4 -0
  74. package/src/libs/feature/editor/src/lib/services/editor.service.ts +1 -1
  75. package/src/libs/feature/map/src/lib/utils/map-utils.service.ts +33 -0
  76. package/src/libs/feature/notify-reuse/src/index.ts +1 -0
  77. package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.css +0 -0
  78. package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.html +1 -0
  79. package/src/libs/feature/notify-reuse/src/lib/notify-reuse-form/notify-reuse-form.component.ts +21 -0
  80. package/src/libs/feature/record/src/lib/map-view/map-view.component.ts +9 -1
  81. package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts +2 -2
  82. package/src/libs/ui/dataviz/src/index.ts +0 -1
  83. package/src/libs/ui/elements/src/index.ts +2 -0
  84. package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.html +88 -0
  85. package/src/libs/ui/elements/src/lib/contact-details/contact-details.component.ts +45 -0
  86. package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.html +41 -0
  87. package/src/libs/ui/elements/src/lib/contact-pill/contact-pill.component.ts +70 -0
  88. package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.css +13 -0
  89. package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html +13 -3
  90. package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.ts +43 -6
  91. package/src/libs/ui/elements/src/lib/internal-link-card/internal-link-card.component.html +1 -1
  92. package/src/libs/ui/elements/src/lib/internal-link-card/internal-link-card.component.ts +0 -1
  93. package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts +2 -2
  94. package/src/libs/ui/elements/src/lib/metadata-contact/metadata-contact.component.ts +2 -5
  95. package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.css +0 -4
  96. package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +39 -68
  97. package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +59 -11
  98. package/src/libs/ui/inputs/src/lib/button/button.component.ts +8 -0
  99. package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts +2 -2
  100. package/src/libs/ui/inputs/src/lib/url-input/url-input.component.html +2 -2
  101. package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts +2 -1
  102. package/src/libs/ui/map/src/lib/components/map-container/map-container.component.ts +2 -1
  103. package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts +15 -64
  104. package/src/libs/ui/map/src/lib/map-utils.ts +48 -0
  105. package/src/libs/ui/search/src/lib/record-preview-feed/record-preview-feed.component.ts +1 -1
  106. package/src/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.html +0 -1
  107. package/src/libs/ui/widgets/src/lib/popover/popover.component.ts +7 -1
  108. package/src/libs/util/app-config/src/lib/app-config.ts +70 -9
  109. package/src/libs/util/app-config/src/lib/model.ts +7 -0
  110. package/src/libs/util/app-config/src/lib/parse-utils.ts +50 -1
  111. package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts +1 -2
  112. package/src/libs/util/data-fetcher/src/lib/readers/wfs.ts +6 -3
  113. package/src/libs/util/i18n/src/index.ts +0 -1
  114. package/src/libs/util/i18n/src/lib/i18n.constants.ts +17 -11
  115. package/src/libs/util/i18n/src/lib/i18n.interceptor.ts +2 -2
  116. package/src/libs/util/i18n/src/lib/i18n.providers.ts +14 -17
  117. package/src/libs/util/i18n/src/lib/test.translate.loader.ts +48 -0
  118. package/src/libs/util/shared/src/lib/links/link-utils.ts +1 -1
  119. package/src/libs/util/shared/src/lib/record/quality-score.util.ts +33 -18
  120. package/src/libs/util/shared/src/lib/services/date.service.ts +3 -3
  121. package/src/libs/util/shared/src/lib/utils/geojson.ts +58 -1
  122. package/src/libs/util/shared/src/lib/utils/index.ts +1 -0
  123. package/src/libs/util/shared/src/lib/utils/user-display.ts +32 -0
  124. package/style.css +0 -1
  125. package/tailwind.base.css +19 -2
  126. package/translations/de.json +33 -20
  127. package/translations/en.json +33 -20
  128. package/translations/es.json +33 -20
  129. package/translations/fr.json +33 -20
  130. package/translations/it.json +33 -20
  131. package/translations/nl.json +33 -20
  132. package/translations/pt.json +33 -20
  133. package/translations/sk.json +33 -20
@@ -1,5 +1,5 @@
1
1
  <gn-ui-content-ghost
2
- [showContent]="imageUrl !== undefined"
2
+ [showContent]="imageUrl() !== undefined"
3
3
  ghostClass="h-full w-full"
4
4
  >
5
5
  @if (imageUrl) {
@@ -9,7 +9,7 @@
9
9
  >
10
10
  <gn-ui-thumbnail
11
11
  class="relative h-full w-full"
12
- [thumbnailUrl]="imageUrl"
12
+ [thumbnailUrl]="imageUrl()"
13
13
  fit="cover"
14
14
  (placeholderShown)="isPlaceholderShown.emit($event)"
15
15
  ></gn-ui-thumbnail>
@@ -18,7 +18,7 @@
18
18
  class="absolute bottom-0 right-0 z-10 mr-2 mb-2"
19
19
  [type]="'outline'"
20
20
  [extraClass]="'!py-2 !px-0'"
21
- (buttonClick)="openLightbox(imageUrl)"
21
+ (buttonClick)="openLightbox()"
22
22
  >
23
23
  <ng-icon name="matZoomOutMap"></ng-icon>
24
24
  </gn-ui-button>
@@ -26,3 +26,13 @@
26
26
  </div>
27
27
  }
28
28
  </gn-ui-content-ghost>
29
+
30
+ <ng-template #imageTemplate>
31
+ <img
32
+ data-test="lightbox-image"
33
+ class="lightbox-image bg-white max-h-[90vh] max-w-[90vw]"
34
+ [src]="imageUrl()"
35
+ alt="Preview image"
36
+ (click)="closeLightbox()"
37
+ />
38
+ </ng-template>
@@ -1,10 +1,19 @@
1
- import { Component, EventEmitter, Input, Output } from '@angular/core'
2
- import * as basicLightbox from 'basiclightbox'
1
+ import {
2
+ Component,
3
+ inject,
4
+ input,
5
+ output,
6
+ TemplateRef,
7
+ viewChild,
8
+ ViewContainerRef,
9
+ } from '@angular/core'
3
10
  import { ContentGhostComponent } from '../content-ghost/content-ghost.component'
4
11
  import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
5
12
  import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
6
13
  import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
7
14
  import { matZoomOutMap } from '@ng-icons/material-icons/baseline'
15
+ import { Overlay, OverlayRef } from '@angular/cdk/overlay'
16
+ import { TemplatePortal } from '@angular/cdk/portal'
8
17
 
9
18
  @Component({
10
19
  selector: 'gn-ui-image-overlay-preview',
@@ -20,9 +29,37 @@ import { matZoomOutMap } from '@ng-icons/material-icons/baseline'
20
29
  ],
21
30
  })
22
31
  export class ImageOverlayPreviewComponent {
23
- @Input() imageUrl: string
24
- @Output() isPlaceholderShown = new EventEmitter<boolean>()
25
- openLightbox(src: string) {
26
- basicLightbox.create(`<img src="${src}"/>`).show()
32
+ imageUrl = input<string>()
33
+ isPlaceholderShown = output<boolean>({})
34
+
35
+ private imageTemplate = viewChild<TemplateRef<HTMLElement>>('imageTemplate')
36
+ private overlay = inject(Overlay)
37
+ private viewContainerRef = inject(ViewContainerRef)
38
+ private overlayRef: OverlayRef
39
+
40
+ openLightbox() {
41
+ const positionStrategy = this.overlay
42
+ .position()
43
+ .global()
44
+ .centerHorizontally()
45
+ .centerVertically()
46
+ const scrollStrategy = this.overlay.scrollStrategies.block()
47
+
48
+ this.overlayRef = this.overlay.create({
49
+ hasBackdrop: true,
50
+ backdropClass: 'bg-black/80',
51
+ positionStrategy,
52
+ scrollStrategy,
53
+ })
54
+ this.overlayRef.backdropClick().subscribe(() => this.overlayRef.dispose())
55
+ const portal = new TemplatePortal(
56
+ this.imageTemplate(),
57
+ this.viewContainerRef
58
+ )
59
+ this.overlayRef.attach(portal)
60
+ }
61
+
62
+ closeLightbox() {
63
+ this.overlayRef?.dispose()
27
64
  }
28
65
  }
@@ -1,6 +1,6 @@
1
1
  <a
2
2
  [attr.href]="linkHref"
3
- [target]="linkTarget"
3
+ target="_self"
4
4
  class="record-card"
5
5
  [ngClass]="cardClass"
6
6
  >
@@ -58,7 +58,6 @@ export class InternalLinkCardComponent implements OnInit {
58
58
  protected elementRef = inject(ElementRef)
59
59
 
60
60
  @Input() record: CatalogRecord
61
- @Input() linkTarget = '_blank'
62
61
  @Input() linkHref: string = null
63
62
  @Input() metadataQualityDisplay: boolean
64
63
  @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
@@ -1,5 +1,5 @@
1
1
  import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
2
- import { marked } from 'marked'
2
+ import { parse } from 'marked'
3
3
 
4
4
  @Component({
5
5
  selector: 'gn-ui-markdown-parser',
@@ -14,6 +14,6 @@ export class MarkdownParserComponent {
14
14
  @Input() whitoutStyles?: boolean
15
15
 
16
16
  get parsedMarkdown() {
17
- return marked.parse(this.textContent ?? '')
17
+ return parse(this.textContent ?? '')
18
18
  }
19
19
  }
@@ -21,7 +21,7 @@ import {
21
21
  matCallOutline,
22
22
  matLocationOnOutline,
23
23
  } from '@ng-icons/material-icons/outline'
24
-
24
+ import { getAddressLines } from '../../../../../../libs/util/shared/src'
25
25
  import { TranslateDirective } from '@ngx-translate/core'
26
26
 
27
27
  @Component({
@@ -59,10 +59,7 @@ export class MetadataContactComponent {
59
59
  }
60
60
 
61
61
  get address() {
62
- const addressParts = this.contacts[0].address
63
- .split(',')
64
- .map((part) => part.trim())
65
- return addressParts
62
+ return getAddressLines(this.contacts[0]?.address)
66
63
  }
67
64
 
68
65
  onOrganizationClick() {
@@ -16,7 +16,3 @@
16
16
  --gn-ui-badge-background-color: var(--color-primary-white);
17
17
  --gn-ui-badge-text-color: var(--color-primary-darkest);
18
18
  }
19
-
20
- :host .metadata-info-keywords ::ng-deep gn-ui-badge:hover {
21
- --gn-ui-badge-text-color: white;
22
- }
@@ -28,12 +28,23 @@
28
28
  <gn-ui-max-lines [maxLines]="7">
29
29
  <div class="metadata-info-keywords sm:pb-4 flex flex-wrap gap-2">
30
30
  @for (keyword of metadata.keywords; track keyword) {
31
- <gn-ui-badge
32
- class="inline-block lowercase"
33
- (click)="onKeywordClick(keyword)"
34
- [clickable]="true"
35
- >{{ keyword.label }}</gn-ui-badge
36
- >
31
+ <ng-template #keywordTooltip>
32
+ @for (segment of keywordTooltipSegments(keyword); track $index) {
33
+ <span [class.font-bold]="$last">{{ segment }}</span>
34
+ @if (!$last) {
35
+ <span> &gt; </span>
36
+ }
37
+ }
38
+ </ng-template>
39
+ <gn-ui-popover [content]="keywordTooltip" theme="dark">
40
+ <gn-ui-button
41
+ type="primary-light"
42
+ class="inline-block opacity-70"
43
+ extraClass="lowercase text-sm py-1 px-2"
44
+ (buttonClick)="onKeywordClick(keyword)"
45
+ >{{ keyword.label }}</gn-ui-button
46
+ >
47
+ </gn-ui-popover>
37
48
  }
38
49
  </div>
39
50
  </gn-ui-max-lines>
@@ -52,7 +63,7 @@
52
63
  data-test="usage-panel"
53
64
  >
54
65
  <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
55
- @for (license of licenses; track license) {
66
+ @for (license of licenses; track $index) {
56
67
  @if (license.url) {
57
68
  <div class="text-primary">
58
69
  <a
@@ -105,9 +116,29 @@
105
116
  </div>
106
117
  </gn-ui-expandable-panel>
107
118
  }
119
+ @if (metadata.contactsForResource?.length) {
120
+ <gn-ui-expandable-panel
121
+ [title]="'record.metadata.resource.contacts' | translate"
122
+ data-test="contacts-panel"
123
+ >
124
+ <div class="flex flex-col gap-1 pt-3 pb-4">
125
+ @for (group of contactGroups; track group.role) {
126
+ <div class="flex flex-col gap-1 rounded py-4 px-2">
127
+ <p class="text-xs font-normal text-black">
128
+ {{ group.roleLabel | translate }}
129
+ </p>
130
+ <div class="grid gap-1 grid-cols-1 md:grid-cols-2">
131
+ @for (contact of group.contacts; track contact.email) {
132
+ <gn-ui-contact-pill [contact]="contact"></gn-ui-contact-pill>
133
+ }
134
+ </div>
135
+ </div>
136
+ }
137
+ </div>
138
+ </gn-ui-expandable-panel>
139
+ }
108
140
  @if (
109
141
  (metadata.kind === 'dataset' && metadata.lineage) ||
110
- resourceContact ||
111
142
  metadata.resourceCreated ||
112
143
  metadata.resourcePublished ||
113
144
  metadata.resourceUpdated ||
@@ -129,66 +160,6 @@
129
160
  </p>
130
161
  </div>
131
162
  }
132
- @if (resourceContact) {
133
- <div
134
- class="flex flex-row gap-6 mt-5 mb-8 resource-contact"
135
- data-test="details-panel-resource-contact"
136
- >
137
- @if (resourceContact.organization?.logoUrl?.href) {
138
- <div
139
- class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
140
- >
141
- <gn-ui-thumbnail
142
- class="relative h-full w-full"
143
- [thumbnailUrl]="resourceContact.organization.logoUrl.href"
144
- fit="contain"
145
- ></gn-ui-thumbnail>
146
- </div>
147
- }
148
- <div class="flex flex-col gap-1">
149
- <p class="text-sm font-medium" translate>record.metadata.producer</p>
150
- <div
151
- class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
152
- data-cy="organization-name"
153
- >
154
- {{ resourceContact.organization?.name }}
155
- </div>
156
- @if (resourceContact.organization?.website) {
157
- <div>
158
- <a
159
- [href]="resourceContact.organization.website"
160
- target="_blank"
161
- class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
162
- >{{ resourceContact.organization.website }}
163
- <ng-icon
164
- class="!w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
165
- name="matOpenInNew"
166
- ></ng-icon>
167
- </a>
168
- </div>
169
- }
170
- @if (resourceContact.email) {
171
- <div class="mt-4">
172
- <div class="flex">
173
- <ng-icon
174
- class="!w-5 !h-5 !text-[20px] opacity-75 shrink-0"
175
- name="matMailOutline"
176
- ></ng-icon>
177
- @if (resourceContact.email) {
178
- <a
179
- [href]="'mailto:' + resourceContact.email"
180
- class="text-sm hover:underline ml-2"
181
- target="_blank"
182
- data-cy="contact-email"
183
- >{{ resourceContact?.email }}</a
184
- >
185
- }
186
- </div>
187
- </div>
188
- }
189
- </div>
190
- </div>
191
- }
192
163
  <div
193
164
  class="py-6 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-6 gap-x-[20px] text-gray-700"
194
165
  >
@@ -8,7 +8,10 @@ import {
8
8
  } from '@angular/core'
9
9
  import {
10
10
  CatalogRecord,
11
+ Individual,
11
12
  Keyword,
13
+ Role,
14
+ RoleLabels,
12
15
  } from '../../../../../../libs/common/domain/src/lib/model/record'
13
16
  import { DateService, getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
14
17
  import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
@@ -16,20 +19,32 @@ import {
16
19
  ExpandablePanelComponent,
17
20
  MaxLinesComponent,
18
21
  } from '../../../../../../libs/ui/layout/src'
19
- import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
22
+ import {
23
+ TranslateDirective,
24
+ TranslatePipe,
25
+ TranslateService,
26
+ } from '@ngx-translate/core'
27
+ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
20
28
  import {
21
29
  BadgeComponent,
30
+ ButtonComponent,
22
31
  CopyTextButtonComponent,
23
32
  } from '../../../../../../libs/ui/inputs/src'
33
+ import { PopoverComponent } from '../../../../../../libs/ui/widgets/src'
24
34
  import { ContentGhostComponent } from '../content-ghost/content-ghost.component'
25
35
  import { NgIcon, provideIcons } from '@ng-icons/core'
26
36
  import { matOpenInNew } from '@ng-icons/material-icons/baseline'
27
37
  import { matMailOutline } from '@ng-icons/material-icons/outline'
28
- import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
29
38
  import { GnUiLinkifyDirective } from './linkify.directive'
30
39
  import { GnUiHumanizeDateDirective } from '../../../../../../libs/util/shared/src'
31
40
 
32
41
  import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
42
+ import { ContactPillComponent } from '../contact-pill/contact-pill.component'
43
+
44
+ marker('domain.record.keywordType.theme')
45
+ marker('domain.record.keywordType.place')
46
+ marker('domain.record.keywordType.temporal')
47
+ marker('domain.record.keywordType.other')
33
48
 
34
49
  @Component({
35
50
  selector: 'gn-ui-metadata-info',
@@ -42,15 +57,17 @@ import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
42
57
  TranslatePipe,
43
58
  MarkdownParserComponent,
44
59
  ExpandablePanelComponent,
60
+ ButtonComponent,
45
61
  BadgeComponent,
46
62
  ContentGhostComponent,
47
- ThumbnailComponent,
48
63
  MaxLinesComponent,
49
64
  CopyTextButtonComponent,
50
65
  NgIcon,
51
66
  GnUiLinkifyDirective,
52
67
  GnUiHumanizeDateDirective,
53
68
  SpatialExtentComponent,
69
+ ContactPillComponent,
70
+ PopoverComponent,
54
71
  ],
55
72
  viewProviders: [
56
73
  provideIcons({
@@ -61,6 +78,7 @@ import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
61
78
  })
62
79
  export class MetadataInfoComponent {
63
80
  private dateService = inject(DateService)
81
+ private translateService = inject(TranslateService)
64
82
 
65
83
  @Input() metadata: Partial<CatalogRecord>
66
84
  @Input() incomplete: boolean
@@ -132,19 +150,49 @@ export class MetadataInfoComponent {
132
150
  return getTemporalRangeUnion(temporalExtents, this.dateService)
133
151
  }
134
152
 
135
- get shownOrganization() {
136
- return this.metadata.ownerOrganization
137
- }
138
-
139
- get resourceContact() {
140
- return this.metadata.contactsForResource?.[0]
141
- }
142
-
143
153
  fieldReady(propName: string) {
144
154
  return !this.incomplete || propName in this.metadata
145
155
  }
146
156
 
157
+ get contactGroups(): {
158
+ role: Role
159
+ roleLabel: string
160
+ contacts: Individual[]
161
+ }[] {
162
+ const groups: { role: Role; roleLabel: string; contacts: Individual[] }[] =
163
+ []
164
+ const indexByRole = new Map<Role, number>()
165
+ for (const contact of this.metadata.contactsForResource ?? []) {
166
+ if (indexByRole.has(contact.role)) {
167
+ groups[indexByRole.get(contact.role)].contacts.push(contact)
168
+ } else {
169
+ indexByRole.set(contact.role, groups.length)
170
+ groups.push({
171
+ role: contact.role,
172
+ roleLabel: RoleLabels.get(contact.role),
173
+ contacts: [contact],
174
+ })
175
+ }
176
+ }
177
+ return groups
178
+ }
179
+
147
180
  onKeywordClick(keyword: Keyword) {
148
181
  this.keyword.emit(keyword)
149
182
  }
183
+
184
+ keywordTooltipSegments(keyword: Keyword): string[] {
185
+ if (keyword.hierarchyPath?.length) {
186
+ return keyword.hierarchyPath
187
+ }
188
+ if (keyword.thesaurus?.name) {
189
+ return [keyword.thesaurus.name, keyword.label]
190
+ }
191
+ return [
192
+ this.translateService.instant(
193
+ `domain.record.keywordType.${keyword.type}`
194
+ ),
195
+ keyword.label,
196
+ ]
197
+ }
150
198
  }
@@ -25,7 +25,9 @@ export class ButtonComponent {
25
25
  | 'outline'
26
26
  | 'light'
27
27
  | 'gray'
28
+ | 'gray-light'
28
29
  | 'black'
30
+ | 'primary-light'
29
31
  ) {
30
32
  // btn-classes are written in full to be picked up by tailwind
31
33
  switch (value) {
@@ -44,9 +46,15 @@ export class ButtonComponent {
44
46
  case 'gray':
45
47
  this.btnClass = 'gn-ui-btn-gray'
46
48
  break
49
+ case 'gray-light':
50
+ this.btnClass = 'gn-ui-btn-gray-light'
51
+ break
47
52
  case 'black':
48
53
  this.btnClass = 'gn-ui-btn-black'
49
54
  break
55
+ case 'primary-light':
56
+ this.btnClass = 'gn-ui-btn-primary-light'
57
+ break
50
58
  case 'default':
51
59
  default:
52
60
  this.btnClass = 'gn-ui-btn-default'
@@ -2,9 +2,9 @@ import {
2
2
  ChangeDetectionStrategy,
3
3
  Component,
4
4
  EventEmitter,
5
+ inject,
5
6
  Input,
6
7
  Output,
7
- inject,
8
8
  } from '@angular/core'
9
9
  import {
10
10
  DateAdapter,
@@ -52,6 +52,6 @@ export class DatePickerComponent {
52
52
  @Output() dateChange = new EventEmitter<Date>()
53
53
 
54
54
  constructor() {
55
- this.dateAdapter.setLocale(this.translate.currentLang)
55
+ this.dateAdapter.setLocale(this.translate.getCurrentLang())
56
56
  }
57
57
  }
@@ -6,7 +6,7 @@
6
6
  type="url"
7
7
  [value]="inputValue"
8
8
  (input)="handleInput($event)"
9
- (keydown.enter)="handleUpload(input)"
9
+ (keydown.enter)="handleUpload(input, $event)"
10
10
  [placeholder]="placeholder"
11
11
  [attr.aria-label]="placeholder"
12
12
  [disabled]="disabled"
@@ -25,7 +25,7 @@
25
25
  extraClass="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)]"
26
26
  type="primary"
27
27
  [disabled]="disabled || input.value === '' || !isValidUrl(input.value)"
28
- (buttonClick)="handleUpload(input)"
28
+ (buttonClick)="handleUpload(input, $event)"
29
29
  >
30
30
  <ng-content>
31
31
  <ng-icon name="iconoirArrowUp"></ng-icon>
@@ -81,7 +81,8 @@ export class UrlInputComponent implements OnChanges {
81
81
  this.valueChange.next(value)
82
82
  }
83
83
 
84
- handleUpload(element: HTMLInputElement) {
84
+ handleUpload(element: HTMLInputElement, event: Event) {
85
+ event.stopPropagation()
85
86
  const value = element.value
86
87
  if (!value || !this.isValidUrl(value)) return
87
88
  this.uploadClick.next(value)
@@ -204,11 +204,12 @@ export class MapContainerComponent implements AfterViewInit, OnChanges {
204
204
 
205
205
  async ngOnChanges(changes: SimpleChanges) {
206
206
  if ('context' in changes && !changes['context'].isFirstChange()) {
207
+ const olMap = await this.openlayersMap
207
208
  const diff = computeMapContextDiff(
208
209
  this.processContext(changes['context'].currentValue),
209
210
  this.processContext(changes['context'].previousValue)
210
211
  )
211
- await applyContextDiffToMap(this.olMap, diff)
212
+ await applyContextDiffToMap(olMap, diff)
212
213
 
213
214
  if (this._resolvedExtentChange && diff.viewChanges) {
214
215
  this._resolvedExtentChange.emit(this.calculateCurrentMapExtent())
@@ -1,18 +1,11 @@
1
- import { Component, Input } from '@angular/core'
1
+ import { ChangeDetectorRef, Component, inject, Input } from '@angular/core'
2
2
  import { CommonModule } from '@angular/common'
3
- import { Geometry } from 'geojson'
4
- import { GeoJSONFeatureCollection } from 'ol/format/GeoJSON.js'
5
- import GeoJSON from 'ol/format/GeoJSON.js'
6
- import { Polygon } from 'ol/geom.js'
7
- import {
8
- createViewFromLayer,
9
- MapContext,
10
- MapContextLayer,
11
- } from '@geospatial-sdk/core'
3
+ import { createViewFromLayer, MapContext } from '@geospatial-sdk/core'
12
4
  import { MapContainerComponent } from '../map-container/map-container.component'
13
- import { BehaviorSubject, Observable } from 'rxjs'
14
- import { switchMap } from 'rxjs/operators'
5
+ import { BehaviorSubject, from, Observable, of } from 'rxjs'
6
+ import { map, switchMap, tap } from 'rxjs/operators'
15
7
  import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/src/lib/model/record'
8
+ import { createSpatialExtentLayer } from '../../map-utils'
16
9
 
17
10
  @Component({
18
11
  selector: 'gn-ui-spatial-extent',
@@ -22,66 +15,24 @@ import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/sr
22
15
  styleUrl: './spatial-extent.component.css',
23
16
  })
24
17
  export class SpatialExtentComponent {
18
+ private _cdr = inject(ChangeDetectorRef)
19
+
25
20
  @Input() set spatialExtents(value: DatasetSpatialExtent[]) {
26
21
  this.spatialExtents$.next(value)
27
22
  }
28
23
  spatialExtents$ = new BehaviorSubject<DatasetSpatialExtent[]>([])
29
24
  mapContext$: Observable<MapContext> = this.spatialExtents$.pipe(
30
- switchMap(async (extents) => {
31
- if (extents.length === 0) {
32
- return null // null extent means default view
33
- }
34
- const featureCollection: GeoJSONFeatureCollection = {
35
- type: 'FeatureCollection',
36
- features: [],
37
- }
38
- extents.forEach((extent) => {
39
- if (extent.geometry) {
40
- featureCollection.features.push({
41
- type: 'Feature',
42
- properties: {},
43
- geometry: extent.geometry,
44
- })
45
- } else if (extent.bbox?.length >= 0) {
46
- featureCollection.features.push({
47
- type: 'Feature',
48
- properties: {},
49
- geometry: this.bboxCoordsToGeometry(extent.bbox),
50
- })
51
- }
52
- })
53
-
54
- const layer: MapContextLayer = {
55
- type: 'geojson',
56
- data: featureCollection,
57
- label: 'Spatial extents',
58
- style: {
59
- 'stroke-color': 'black',
60
- 'stroke-width': 2,
61
- 'fill-color': 'rgba(153, 153, 153, 0.3)',
62
- },
63
- }
64
- const view = await createViewFromLayer(layer)
65
- return {
66
- view,
67
- layers: [layer],
25
+ switchMap((extents) => {
26
+ const layer = createSpatialExtentLayer(extents)
27
+ if (!layer) {
28
+ return of(null)
68
29
  }
30
+ return from(createViewFromLayer(layer)).pipe(
31
+ map((view) => ({ view, layers: [layer] }) as MapContext),
32
+ tap(() => this._cdr.markForCheck())
33
+ )
69
34
  })
70
35
  )
71
36
 
72
37
  error = ''
73
-
74
- bboxCoordsToGeometry(bbox: [number, number, number, number]): Geometry {
75
- const geometry = new Polygon([
76
- [
77
- [bbox[0], bbox[1]],
78
- [bbox[0], bbox[3]],
79
- [bbox[2], bbox[3]],
80
- [bbox[2], bbox[1]],
81
- [bbox[0], bbox[1]],
82
- ],
83
- ])
84
-
85
- return new GeoJSON().writeGeometryObject(geometry)
86
- }
87
38
  }
@@ -12,6 +12,54 @@ import {
12
12
  MouseWheelZoom,
13
13
  } from 'ol/interaction.js'
14
14
  import MapBrowserEvent from 'ol/MapBrowserEvent.js'
15
+ import type { DatasetSpatialExtent } from '../../../../../libs/common/domain/src/lib/model/record'
16
+ import type {
17
+ MapContextLayer,
18
+ MapContextLayerGeojson,
19
+ } from '@geospatial-sdk/core'
20
+ import { spatialExtentsToFeatureCollection } from '../../../../../libs/util/shared/src'
21
+
22
+ export type SpatialExtentLayerStyle = NonNullable<
23
+ MapContextLayerGeojson['style']
24
+ >
25
+
26
+ /**
27
+ * Default style for a spatial-extent layer: a solid black outline over a
28
+ * translucent grey fill.
29
+ */
30
+ export const DEFAULT_SPATIAL_EXTENT_STYLE: SpatialExtentLayerStyle = {
31
+ 'stroke-color': 'black',
32
+ 'stroke-width': 2,
33
+ 'fill-color': 'rgba(153, 153, 153, 0.3)',
34
+ }
35
+
36
+ /**
37
+ * Builds a GeoJSON map layer drawing the given spatial extents: each extent is
38
+ * rendered from its own geometry or, when only a bounding box is available,
39
+ * from a polygon derived from that box.
40
+ *
41
+ * @returns the layer, or `null` when none of the extents can be represented.
42
+ */
43
+ export function createSpatialExtentLayer(
44
+ extents: DatasetSpatialExtent[],
45
+ overrides?: {
46
+ label?: string
47
+ clickable?: boolean
48
+ style?: SpatialExtentLayerStyle
49
+ }
50
+ ): MapContextLayer | null {
51
+ const data = spatialExtentsToFeatureCollection(extents)
52
+ if (data.features.length === 0) {
53
+ return null
54
+ }
55
+ return {
56
+ type: 'geojson',
57
+ data,
58
+ label: 'Spatial extents',
59
+ style: DEFAULT_SPATIAL_EXTENT_STYLE,
60
+ ...overrides,
61
+ }
62
+ }
15
63
 
16
64
  export function prioritizePageScroll(interactions: Collection<Interaction>) {
17
65
  interactions.clear()