geonetwork-ui 2.7.0-dev.fa54bd3a5 → 2.7.0-dev.fb5b118d5

package/src/libs/util/shared/src/lib/record/quality-score.util.ts

@@ -0,0 +1,72 @@
+import {
+  CatalogRecord,
+  RecordKind,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
+
+type TValidatorMapper = {
+  [key: string]: (metadata: Partial<CatalogRecord>) => boolean
+}
+
+const ValidatorMapper: TValidatorMapper = {
+  title: (record) => !!record?.title,
+  abstract: (record) => !!record?.abstract,
+  keywords: (record) => (record?.keywords?.length ?? 0) > 0,
+  legalConstraints: (record) =>
+    !!(
+      record?.legalConstraints?.length &&
+      record.legalConstraints.some((c) => c?.text?.trim().length > 0)
+    ),
+  contacts: (record) =>
+    !!record?.contacts?.[0]?.email &&
+    record.contacts[0].email !== 'missing@missing.com',
+  updateFrequency: (record) =>
+    !!record?.updateFrequency && record.updateFrequency !== 'unknown',
+  topics: (record) => (record?.topics?.length ?? 0) > 0,
+  organisation: (record) => !!record?.contacts?.[0]?.organization?.name,
+  source: (record) => !!record?.extras?.sourcesIdentifiers,
+} as const
+
+export type ValidatorMapperKeys = keyof typeof ValidatorMapper & string
+
+export function getAllKeysValidator() {
+  return Object.keys(ValidatorMapper)
+}
+
+function getMappersFromKind(kind: RecordKind) {
+  let kindKeys = <ValidatorMapperKeys[]>[]
+  const commonsKeys = <ValidatorMapperKeys[]>[
+    'title',
+    'abstract',
+    'keywords',
+    'legalConstraints',
+    'contacts',
+  ]
+
+  switch (kind) {
+    case 'reuse':
+      kindKeys = ['topics', 'organisation', 'source']
+      break
+    case 'service':
+      kindKeys = []
+      break
+    case 'dataset':
+    default:
+      kindKeys = ['updateFrequency', 'topics', 'organisation']
+  }
+
+  return [...commonsKeys, ...kindKeys]
+}
+
+export function getQualityValidators(
+  record: Partial<CatalogRecord>,
+  propsToValidate: ValidatorMapperKeys[]
+) {
+  const filteredProps = propsToValidate.filter((prop) =>
+    getMappersFromKind(record.kind).includes(prop)
+  )
+
+  return filteredProps.map((name) => ({
+    name,
+    validator: () => ValidatorMapper[name](record),
+  }))
+}

package/src/libs/util/shared/src/lib/{record.util.ts → record/record.util.ts}

@@ -10,7 +10,7 @@ import {
   OnlineLinkResource,
   Organization,
   ServiceEndpoint,
-} from '../../../../../libs/common/domain/src/lib/model/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
 type TranslatedRecordObjects =
   | BaseRecord

package/src/libs/util/shared/src/lib/utils/geojson.ts

@@ -1,8 +1,11 @@
-import { Feature, FeatureCollection, Geometry } from 'geojson'
+import type { Feature, FeatureCollection, Geometry, Position } from 'geojson'
 
+/**
+ * @returns The geometry if available, otherwise null.
+ */
 export function getGeometryFromGeoJSON(
   data: FeatureCollection | Feature | Geometry
-): Geometry {
+): Geometry | null {
   if (data.type === 'FeatureCollection') {
     return data?.features?.[0]?.geometry || null
   }
@@ -24,3 +27,70 @@ export function getGeometryFromGeoJSON(
   }
   return null
 }
+
+// FIXME: this type should be more generic across the project
+export type BoundingBox = [number, number, number, number]
+
+export function getGeometryBoundingBox(geometry: Geometry): BoundingBox {
+  // use the bounding box if specified in the GeoJSON object
+  if (geometry.bbox) {
+    return geometry.bbox.length > 4
+      ? [geometry.bbox[0], geometry.bbox[1], geometry.bbox[3], geometry.bbox[4]]
+      : (geometry.bbox as BoundingBox)
+  }
+
+  const coordinatesReducer = (prev: BoundingBox, coords: Position) =>
+    [
+      Math.min(prev[0], coords[0]),
+      Math.min(prev[1], coords[1]),
+      Math.max(prev[2], coords[0]),
+      Math.max(prev[3], coords[1]),
+    ] as BoundingBox
+  const coordinatesArrayReducer = (
+    prev: BoundingBox,
+    coordsArray: Position[]
+  ) => {
+    const bbox = coordsArray.reduce(coordinatesReducer, emptyExtent)
+    return [
+      Math.min(prev[0], bbox[0]),
+      Math.min(prev[1], bbox[1]),
+      Math.max(prev[2], bbox[2]),
+      Math.max(prev[3], bbox[3]),
+    ] as BoundingBox
+  }
+  const emptyExtent = [Infinity, Infinity, -Infinity, -Infinity] as BoundingBox
+
+  switch (geometry.type) {
+    case 'MultiPolygon':
+      return geometry.coordinates.reduce((prev, polygonCoords) => {
+        const bbox = polygonCoords.reduce(coordinatesArrayReducer, emptyExtent)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'GeometryCollection':
+      return geometry.geometries.reduce((prev, geom) => {
+        const bbox = getGeometryBoundingBox(geom)
+        return [
+          Math.min(prev[0], bbox[0]),
+          Math.min(prev[1], bbox[1]),
+          Math.max(prev[2], bbox[2]),
+          Math.max(prev[3], bbox[3]),
+        ] as BoundingBox
+      }, emptyExtent)
+    case 'Polygon':
+    case 'MultiLineString':
+      return geometry.coordinates.reduce(coordinatesArrayReducer, emptyExtent)
+    case 'LineString':
+    case 'MultiPoint':
+      return geometry.coordinates.reduce<BoundingBox>(
+        coordinatesReducer,
+        emptyExtent
+      )
+    case 'Point':
+      return coordinatesReducer(emptyExtent, geometry.coordinates)
+  }
+}

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -4,9 +4,11 @@ export * from './format-fields'
 export * from './fuzzy-filter'
 export * from './geojson'
 export * from './image-resize'
+export * from './mobile-screen'
 export * from './no-duplicate-file-name'
 export * from './parse'
 export * from './remove-whitespace'
+export * from './scroll'
 export * from './sort-by'
 export * from './strip-html'
 export * from './temporal-extent-union'

package/src/libs/util/shared/src/lib/utils/mobile-screen.ts

@@ -0,0 +1,14 @@
+import { fromEvent, startWith, map, shareReplay } from 'rxjs'
+
+/**
+ * This returns true when the screen size is under 768px, which is the mobile threshold.
+ */
+const MOBILE_MAX_WIDTH = 768
+
+export function getIsMobile() {
+  return fromEvent(window, 'resize').pipe(
+    startWith(window.innerWidth),
+    map(() => window.innerWidth < MOBILE_MAX_WIDTH),
+    shareReplay({ bufferSize: 1, refCount: true })
+  )
+}

package/src/libs/util/shared/src/lib/utils/scroll.ts

@@ -0,0 +1,48 @@
+import { ViewportScroller } from '@angular/common'
+import { Event, NavigationEnd, Router, Scroll } from '@angular/router'
+import { filter, pairwise, tap } from 'rxjs'
+
+/**
+ * When route is changed, Angular interprets a simple query params change as "forward navigation" too.
+ * Using the pairwise function allows us to have both the previous and current router events, which we can
+ * use to effectively compare the two navigation events and see if they actually change route, or only
+ * the route parameters (i.e. search params stored in query params).
+ *
+ * Related to: https://github.com/angular/angular/issues/26744
+ */
+export function handleScrollOnNavigation(
+  router: Router,
+  viewportScroller: ViewportScroller
+): void {
+  router.events
+    .pipe(
+      filter((e: Event): e is Scroll => e instanceof Scroll),
+      pairwise()
+    )
+    .subscribe(([previous, current]: [Scroll, Scroll]) => {
+      if (current.position) {
+        // Backward navigation
+        viewportScroller.scrollToPosition(current.position)
+      } else if (current.anchor) {
+        // Anchor navigation
+        viewportScroller.scrollToAnchor(current.anchor)
+      } else {
+        // Check if routes match, or if it is only a query param change
+        if (
+          previous.routerEvent instanceof NavigationEnd &&
+          current.routerEvent instanceof NavigationEnd &&
+          getBaseRoute(previous.routerEvent.urlAfterRedirects) !==
+            getBaseRoute(current.routerEvent.urlAfterRedirects)
+        ) {
+          // Routes don't match, this is actual forward navigation
+          // Default behavior: scroll to top
+          viewportScroller.scrollToPosition([0, 0])
+        }
+      }
+    })
+}
+
+function getBaseRoute(url: string): string {
+  // return url without query params
+  return url.split('?')[0]
+}

package/translations/de.json

@@ -3,7 +3,7 @@
   "Add Layer As": "",
   "Enter to search": "",
   "button.login": "",
-  "catalog.figures.datasets": "{count, plural, =0{Datensätze} one{Datensatz} other{Datensätze}}",
+  "catalog.figures.datasets": "{count, plural, =0{Ressource} one{Ressource} other{Ressourcen}}",
   "catalog.figures.organizations": "{count, plural, =0{Organisationen} one{Organisation} other{Organisationen}}",
   "chart.aggregation.average": "Durchschnitt",
   "chart.aggregation.count": "Anzahl",
@@ -86,7 +86,9 @@
   "domain.record.status.completed": "Abgeschlossen",
   "domain.record.status.deprecated": "Veraltet",
   "domain.record.status.ongoing": "Kontinuierliche Aktualisierung",
+  "domain.record.status.planned": "",
   "domain.record.status.removed": "Entfernt",
+  "domain.record.status.required": "",
   "domain.record.status.under_development": "In Erstellung",
   "domain.record.updateFrequency.annually": "Daten werden jedes Jahr aktualisiert",
   "domain.record.updateFrequency.asNeeded": "Daten werden nach Bedarf aktualisiert",
@@ -142,6 +144,7 @@
   "editor.record.form.draft.updateAlert": "",
   "editor.record.form.field.abstract": "Kurzbeschreibung",
   "editor.record.form.field.constraintsShortcuts": "",
+  "editor.record.form.field.contacts": "Ansprechpartner - Email",
   "editor.record.form.field.contacts.noContact": "",
   "editor.record.form.field.contacts.placeholder": "",
   "editor.record.form.field.contactsForResource.noContact": "",
@@ -166,6 +169,7 @@
   "editor.record.form.field.onlineResource.toggle.dataset": "",
   "editor.record.form.field.onlineResource.toggle.service": "",
   "editor.record.form.field.onlineResources": "",
+  "editor.record.form.field.organisation": "Ansprechpartner - Organisation",
   "editor.record.form.field.otherConstraints": "Allgemeine Einschränkung",
   "editor.record.form.field.overviews": "",
   "editor.record.form.field.recordUpdated": "Datensatz zuletzt aktualisiert",
@@ -177,8 +181,29 @@
   "editor.record.form.field.temporalExtents": "Zeitlicher Umfang",
   "editor.record.form.field.title": "Metadaten-Titel",
   "editor.record.form.field.title.placeholder": "Geben Sie einen Titel ein",
+  "editor.record.form.field.topics": "Kategorien",
   "editor.record.form.field.uniqueIdentifier": "Eindeutige Kennung (ID)",
   "editor.record.form.field.updateFrequency": "Aktualisierungshäufigkeit",
+  "editor.record.form.inspire.biota": "",
+  "editor.record.form.inspire.boundaries": "",
+  "editor.record.form.inspire.climatology": "",
+  "editor.record.form.inspire.economy": "",
+  "editor.record.form.inspire.elevation": "",
+  "editor.record.form.inspire.environnement": "",
+  "editor.record.form.inspire.farming": "",
+  "editor.record.form.inspire.geoscientific": "",
+  "editor.record.form.inspire.health": "",
+  "editor.record.form.inspire.imagery": "",
+  "editor.record.form.inspire.intelligence": "",
+  "editor.record.form.inspire.location": "",
+  "editor.record.form.inspire.oceans": "",
+  "editor.record.form.inspire.placeholder": "",
+  "editor.record.form.inspire.planning": "",
+  "editor.record.form.inspire.society": "",
+  "editor.record.form.inspire.structure": "",
+  "editor.record.form.inspire.transportation": "",
+  "editor.record.form.inspire.utilities": "",
+  "editor.record.form.inspire.waters": "",
   "editor.record.form.keywords.place.placeholder": "",
   "editor.record.form.keywords.place.withoutExtent": "",
   "editor.record.form.keywords.placeholder": "",
@@ -191,6 +216,8 @@
   "editor.record.form.license.odc-by": "",
   "editor.record.form.license.pddl": "",
   "editor.record.form.license.unknown": "",
+  "editor.record.form.metadataQuality.open": "Öffnen Sie das Panel zur Metadatenqualität",
+  "editor.record.form.metadataQuality.title": "Vollständigkeit",
   "editor.record.form.multilingual.activate": "",
   "editor.record.form.multilingual.default": "",
   "editor.record.form.multilingual.enable": "",
@@ -212,6 +239,8 @@
   "editor.record.form.section.dataManagers.description": "",
   "editor.record.form.section.dataManagers.label": "",
   "editor.record.form.section.geographicalCoverage.label": "",
+  "editor.record.form.section.inspire.description": "",
+  "editor.record.form.section.inspire.label": "",
   "editor.record.form.section.metadataPointOfContact.description": "",
   "editor.record.form.section.metadataPointOfContact.label": "",
   "editor.record.form.section.useAndAccessConditions.label": "",
@@ -280,7 +309,8 @@
   "facets.block.title.tag.default": "Stichwort",
   "facets.block.title.th_regions_tree.default": "Regionen",
   "favorite.not.authenticated.tooltip": "<div><a href=' {link} '>Anmelden</a>, um auf diese Funktion zuzugreifen</div>",
-  "favorite.starToggle.label": "Zu Favoriten hinzufügen",
+  "favorite.starToggle.add": "Zu Favoriten hinzufügen",
+  "favorite.starToggle.remove": "Aus Favoriten entfernen",
   "feature.catalog.attribute.code": "Code",
   "feature.catalog.attribute.definition": "Beschreibung",
   "feature.catalog.attribute.name": "Name",
@@ -360,10 +390,10 @@
   "organisations.sortBy.nameDesc": "Name Z → A",
   "organisations.sortBy.recordCountAsc": "Veröffentlichungen 0 → 9",
   "organisations.sortBy.recordCountDesc": "Veröffentlichungen 9 → 0",
-  "organization.details.lastPublishedDatasets": "",
+  "organization.details.lastPublishedDatasets": "Zuletzt veröffentlichte Ressourcen",
   "organization.details.lastPublishedDatasets.searchAllButton": "",
   "organization.details.mailContact": "",
-  "organization.header.recordCount": "{count, plural, =0{} one{} other{}}",
+  "organization.header.recordCount": "{count, plural, =0{Veröffentlichung} one{Veröffentlichung} other{Veröffentlichungen}}",
   "pagination.nextPage": "Nächste Seite",
   "pagination.page": "Seite",
   "pagination.pageOf": "von",
@@ -383,6 +413,16 @@
   "record.kind.service": "",
   "record.metadata.about": "Beschreibung",
   "record.metadata.api": "API",
+  "record.metadata.api.accessServiceProtocol.GPFDL": "",
+  "record.metadata.api.accessServiceProtocol.esriRest": "",
+  "record.metadata.api.accessServiceProtocol.maplibre-style": "",
+  "record.metadata.api.accessServiceProtocol.ogcFeatures": "",
+  "record.metadata.api.accessServiceProtocol.other": "",
+  "record.metadata.api.accessServiceProtocol.tms": "",
+  "record.metadata.api.accessServiceProtocol.wfs": "",
+  "record.metadata.api.accessServiceProtocol.wms": "",
+  "record.metadata.api.accessServiceProtocol.wmts": "",
+  "record.metadata.api.accessServiceProtocol.wps": "",
   "record.metadata.api.form.closeButton": "Schließen",
   "record.metadata.api.form.closeForm": "Formular schließen",
   "record.metadata.api.form.create": "Ihre Anfrage erstellen",
@@ -444,12 +484,12 @@
   "record.metadata.publication": "Veröffentlichungsdatum",
   "record.metadata.publications": "{count, plural, =0{Veröffentlichungsdatum} one{Veröffentlichungsdatum} other{Veröffentlichungen}}",
   "record.metadata.quality": "Metadatenqualität",
+  "record.metadata.quality.abstract.failed": "Beschreibung nicht angegeben",
+  "record.metadata.quality.abstract.success": "Beschreibung angegeben",
   "record.metadata.quality.capabilities.failed": "",
-  "record.metadata.quality.capabilities.success": "",
-  "record.metadata.quality.contact.failed": "Kontakt nicht angegeben",
-  "record.metadata.quality.contact.success": "Kontakt angegeben",
-  "record.metadata.quality.description.failed": "Beschreibung nicht angegeben",
-  "record.metadata.quality.description.success": "Beschreibung angegeben",
+  "record.metadata.quality.capabilities.success": "Kontakt angegeben",
+  "record.metadata.quality.contacts.failed": "Kontakt nicht angegeben",
+  "record.metadata.quality.contacts.success": "",
   "record.metadata.quality.details": "Details",
   "record.metadata.quality.keywords.failed": "Schlagwörter nicht angegeben",
   "record.metadata.quality.keywords.success": "Schlagwörter angegeben",
@@ -461,8 +501,8 @@
   "record.metadata.quality.source.success": "",
   "record.metadata.quality.title.failed": "Titel nicht angegeben",
   "record.metadata.quality.title.success": "Titel angegeben",
-  "record.metadata.quality.topic.failed": "Thema nicht angegeben",
-  "record.metadata.quality.topic.success": "Thema angegeben",
+  "record.metadata.quality.topics.failed": "Thema nicht angegeben",
+  "record.metadata.quality.topics.success": "Thema angegeben",
   "record.metadata.quality.updateFrequency.failed": "Aktualisierungsfrequenz nicht angegeben",
   "record.metadata.quality.updateFrequency.success": "Aktualisierungsfrequenz angegeben",
   "record.metadata.related": "Entdecken Sie den Katalog",
@@ -483,6 +523,7 @@
   "record.metadata.usage": "Nutzung und Einschränkungen",
   "record.metadata.userFeedbacks": "",
   "record.metadata.userFeedbacks.anonymousUser": "",
+  "record.metadata.userFeedbacks.authDisabled": "",
   "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
   "record.metadata.userFeedbacks.newAnswer.placeholder": "",
   "record.metadata.userFeedbacks.newComment.placeholder": "",
@@ -493,18 +534,18 @@
   "record.tab.chart": "Diagramm",
   "record.tab.data": "Tabelle",
   "record.tab.map": "Karte",
-  "record.was.created.time": "erstellte diesen Datensatz {time}",
+  "record.was.created.time": "erstellte diesen Ressource {time}",
   "records": "Datensätze",
   "results.layout.selectOne": "Layout auswählen",
-  "results.records.hits.displayedOn": "{displayed, plural, =0{Kein Datensatz.} one{1 Datensatz} other{{displayed} Datensätze }} {hits, plural, other{angezeigt von {hits} insgesamt.}}",
+  "results.records.hits.displayedOn": "{displayed, plural, =0{Kein Ressource.} one{1 } other{{displayed} }} {hits, plural, other{von insgesamt {hits} angezeigt.}}",
   "results.records.hits.empty.help.html": "Vorschläge: <ul class='list-disc list-inside'><li>Versuchen Sie es mit anderen Worten</li><li>Beschränken Sie die Suchwörter</li></ul>",
-  "results.records.hits.found": "{hits, plural, =0{Keine Dokumente entsprechen der angegebenen Suche.} one{1 Datensatz gefunden.} other{{hits} Datensätze gefunden.}}",
+  "results.records.hits.found": "{hits, plural, =0{Keine Ressource entsprechen der angegebenen Suche.} one{1 Ressource gefunden.} other{{hits} Ressourcen gefunden.}}",
   "results.records.hits.selected": "{ amount } ausgewählt",
   "results.showMore": "Mehr Ergebnisse anzeigen...",
   "results.sortBy.changeDate": "",
   "results.sortBy.dateStamp": "Neueste",
   "results.sortBy.popularity": "Beliebtheit",
-  "results.sortBy.qualityScore": "Qualitätsbewertung",
+  "results.sortBy.qualityScore": "Fertigstellungsanzeige",
   "results.sortBy.relevancy": "Relevanz",
   "reuse.metadata.access": "",
   "search.autocomplete.error": "Vorschläge konnten nicht abgerufen werden:",
@@ -513,7 +554,7 @@
   "search.error.organizationNotFound": "",
   "search.error.receivedError": "Ein Fehler ist aufgetreten",
   "search.error.recordHasnolink": "",
-  "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
+  "search.error.recordNotFound": "Die Ressource mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
   "search.field.any.placeholder": "Suche im katalog ...",
   "search.field.sortBy": "Sortieren nach:",
   "search.filter.into.feature.catalog": "",
@@ -540,10 +581,10 @@
   "search.filters.license.unknown": "Unbekannt oder nicht vorhanden",
   "search.filters.maximize": "Erweitern",
   "search.filters.minimize": "Minimieren",
-  "search.filters.myRecords": "Nur meine Datensätze anzeigen",
-  "search.filters.myRecordsHelp": "Wenn dies aktiviert ist, werden nur von mir erstellte Datensätze angezeigt; Datensätze, die von anderen erstellt wurden, werden nicht angezeigt.",
+  "search.filters.myRecords": "Nur meine Ressourcen anzeigen",
+  "search.filters.myRecordsHelp": "Wenn dies aktiviert ist, werden nur von mir erstellte Ressourcen angezeigt; Ressourcen, die von anderen erstellt wurden, werden nicht angezeigt.",
   "search.filters.organization": "",
-  "search.filters.otherRecords": "Datensätze von einer anderen Person anzeigen",
+  "search.filters.otherRecords": "Ressourcen von einer anderen Person anzeigen",
   "search.filters.producerOrg": "",
   "search.filters.publicationYear": "Veröffentlichungsjahr",
   "search.filters.publisherOrg": "",
@@ -558,8 +599,8 @@
   "search.filters.summaryLabel.user": "Geändert von: ",
   "search.filters.title": "Ergebnisse filtern",
   "search.filters.topic": "Themen",
-  "search.filters.useSpatialFilter": "Zuerst Datensätze im Interessenbereich anzeigen",
-  "search.filters.useSpatialFilterHelp": "Wenn diese Option aktiviert ist, werden Datensätze im Bereich des Katalogs zuerst angezeigt. Datensätze außerhalb dieses Bereichs werden nicht angezeigt.",
+  "search.filters.useSpatialFilter": "Zuerst Ressourcen im Interessenbereich anzeigen",
+  "search.filters.useSpatialFilterHelp": "Wenn diese Option aktiviert ist, werden Ressourcen im Bereich des Katalogs zuerst angezeigt. Ressourcen außerhalb dieses Bereichs werden nicht angezeigt.",
   "search.filters.user": "Editor",
   "service.metadata.capabilities": "",
   "service.metadata.capabilities.abstract": "",