geonetwork-ui 2.4.0-dev.613f7319 → 2.4.0-dev.614b0d9f

package/src/libs/util/app-config/src/lib/fixtures.ts

@@ -1,6 +1,6 @@
 import { MapConfig } from './model'
 
-export const CONFIG_OK = `
+export const okAppConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
@@ -63,9 +63,9 @@ my.sample.text = "Un bon exemple de texte."
 "my.quoted.text" = 'du texte entre guillements.'
 `
 
-export const CONFIG_WITH_TRANSLATIONS = CONFIG_OK
+export const appConfigWithTranslationFixture = () => okAppConfigFixture()
 
-export const CONFIG_MINIMAL = `
+export const minimalAppConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
@@ -77,7 +77,7 @@ main_color = "#212029" # All-purpose text color
 background_color = "#fdfbff"
 `
 
-export const MAP_CONFIG_FIXTURE: MapConfig = {
+export const mapConfigFixture = (): MapConfig => ({
   MAX_ZOOM: 10,
   MAX_EXTENT: [-418263.418776, 5251529.591305, 961272.067714, 6706890.609855],
   DO_NOT_USE_DEFAULT_BASEMAP: false,
@@ -101,15 +101,15 @@ export const MAP_CONFIG_FIXTURE: MapConfig = {
       NAME: 'some_layername',
     },
   ],
-}
+})
 
-export const CONFIG_MALFORMED = `
+export const malformedConfigFixture = () => `
 {
   "I thought": "we were still doing json"
 }
 `
 
-export const CONFIG_MISSING_MANDATORY = `
+export const missingMandatoryConfigFixture = () => `
 [theme]
 primary_color = "#093564"
 secondary_color = "#c2e9dc"
@@ -117,7 +117,7 @@ background_color = "#fdfbff"
 main_font = 'sans-serif'
 `
 
-export const CONFIG_WRONG_LANGUAGE_CODE = `
+export const wrongLanguageCodeConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
@@ -132,7 +132,7 @@ main_color = "#212029" # All-purpose text color
 background_color = "#fdfbff"
 `
 
-export const CONFIG_UNRECOGNIZED_KEYS = `
+export const unrecognizedKeysConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="

package/src/libs/util/app-config/src/lib/map-layers.ts

@@ -0,0 +1,31 @@
+import { LayerConfig } from './model'
+import { MapContextLayer } from '@geospatial-sdk/core'
+
+export function getMapContextLayerFromConfig(
+  config: LayerConfig
+): MapContextLayer {
+  switch (config.TYPE) {
+    case 'wms':
+      return {
+        type: 'wms',
+        url: config.URL,
+        name: config.NAME,
+      }
+    case 'wfs':
+      return {
+        type: 'wfs',
+        url: config.URL,
+        featureType: config.NAME,
+      }
+    case 'xyz':
+      return {
+        type: config.TYPE,
+        url: config.URL,
+      }
+    case 'geojson':
+      return {
+        type: config.TYPE,
+        ...(config.DATA ? { data: config.DATA } : { url: config.URL }),
+      }
+  }
+}

package/src/libs/util/shared/src/lib/links/link-classifier.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getFileFormat } from './link-utils'
+
 export enum LinkUsage {
   API = 'api',
   MAP_API = 'mapapi',
@@ -15,7 +16,7 @@ export enum LinkUsage {
   providedIn: 'root',
 })
 export class LinkClassifierService {
-  getUsagesForLink(link: DatasetDistribution): LinkUsage[] {
+  getUsagesForLink(link: DatasetOnlineResource): LinkUsage[] {
     switch (link.type) {
       case 'service': {
         switch (link.accessServiceProtocol) {
@@ -51,7 +52,7 @@ export class LinkClassifierService {
     }
   }
 
-  hasUsage(link: DatasetDistribution, usage: LinkUsage) {
+  hasUsage(link: DatasetOnlineResource, usage: LinkUsage) {
     return this.getUsagesForLink(link).indexOf(usage) > -1
   }
 }

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -1,5 +1,5 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 marker('downloads.wfs.featuretype.not.found')
 
@@ -131,7 +131,7 @@ export function getFormatPriority(linkFormat: FileFormat): number {
   return 0
 }
 
-export function getLinkPriority(link: DatasetDistribution): number {
+export function getLinkPriority(link: DatasetOnlineResource): number {
   return getFormatPriority(getFileFormat(link))
 }
 
@@ -155,7 +155,7 @@ export function getFileFormatFromServiceOutput(
   return null
 }
 
-export function getFileFormat(link: DatasetDistribution): FileFormat {
+export function getFileFormat(link: DatasetOnlineResource): FileFormat {
   if ('mimeType' in link) {
     const mimeTypeFormat = mimeTypeToFormat(link.mimeType)
     if (mimeTypeFormat !== null) {
@@ -172,7 +172,7 @@ export function getFileFormat(link: DatasetDistribution): FileFormat {
 }
 
 export function isFormatInQueryParam(
-  link: DatasetDistribution,
+  link: DatasetOnlineResource,
   alias: string
 ): boolean {
   const queryParams = link.url.searchParams
@@ -194,7 +194,7 @@ export function mimeTypeToFormat(mimeType: string): FileFormat {
 }
 
 export function checkFileFormat(
-  link: DatasetDistribution,
+  link: DatasetOnlineResource,
   format: FileFormat
 ): boolean {
   return (
@@ -214,7 +214,7 @@ export function getBadgeColor(linkFormat: FileFormat): string {
   return 'var(--color-gray-700)' // Default color ?
 }
 
-export function getLinkLabel(link: DatasetDistribution): string {
+export function getLinkLabel(link: DatasetOnlineResource): string {
   let format = ''
   switch (link.type) {
     case 'service':

package/src/libs/util/shared/src/lib/services/theme.service.ts

@@ -109,6 +109,7 @@ export class ThemeService {
     applyColor('gray-700', scale(0.7))
     applyColor('gray-800', scale(0.8))
     applyColor('gray-900', scale(0.9))
+    applyColor('gray-950', scale(0.95))
 
     if (mainFont) {
       document.documentElement.style.setProperty(`--font-family-main`, mainFont)

package/src/libs/util/shared/src/lib/utils/bytes-convert.ts

@@ -1,3 +1,6 @@
-export function megabytesToBytes(megabytes) {
+export function megabytesToBytes(megabytes: number) {
   return megabytes * 1048576
 }
+export function bytesToMegabytes(bytes: number) {
+  return bytes / 1048576
+}

package/tailwind.base.config.js

@@ -30,6 +30,7 @@ module.exports = {
           700: 'var(--color-gray-700)',
           800: 'var(--color-gray-800)',
           900: 'var(--color-gray-900)',
+          950: 'var(--color-gray-950)',
         },
         orange: {
           50: '#fff8f1',

package/tailwind.base.css

@@ -4,6 +4,16 @@
 
 /* PLEASE NOTE: all Tailwind components should be prefixed by `gn-ui` */
 @layer components {
+  .container-sm {
+    max-width: 640px;
+  }
+  .container-md {
+    max-width: 768px;
+  }
+  .container-lg {
+    max-width: 1024px;
+  }
+
   /* TODO: add prefix */
   .card-shadow {
     @apply shadow-xl hover:shadow-xl-hover transition-shadow;
@@ -65,8 +75,10 @@
       text-[length:--font-size] leading-none
       p-[--padding] rounded-[--rounded] w-[--width] h-[--height] overflow-hidden
       bg-[--background] transition-all duration-100
-      focus:outline-none
-      disabled:opacity-50 disabled:pointer-events-none;
+      outline-none
+      relative
+      disabled:opacity-50 disabled:pointer-events-none
+      focus:z-10 active:z-10 hover:z-10;
   }
   /* makes sure icons will not make the buttons grow vertically */
   .gn-ui-btn mat-icon.mat-icon {
@@ -74,10 +86,6 @@
     margin-bottom: -0.325em;
     flex-shrink: 0;
   }
-  /* makes spinners appear in the right color */
-  .gn-ui-btn mat-spinner circle {
-    stroke: currentColor !important;
-  }
 
   .gn-ui-btn-default {
     @apply gn-ui-btn text-white
@@ -97,6 +105,18 @@
       border border-secondary focus:ring-4 focus:ring-secondary-lightest;
   }
 
+  .gn-ui-btn-gray {
+    @apply gn-ui-btn text-black
+    bg-gray-100 hover:bg-gray-200 focus:bg-gray-200 active:bg-gray-300
+    border border-gray-100 focus:ring-4 focus:ring-gray-50;
+  }
+
+  .gn-ui-btn-black {
+    @apply gn-ui-btn text-white
+    bg-black hover:bg-gray-950 focus:bg-gray-950 active:bg-gray-900
+    border border-black focus:ring-4 focus:ring-gray-300;
+  }
+
   .gn-ui-btn-outline {
     @apply gn-ui-btn text-main
     hover:text-primary-darker focus:text-primary-darker active:text-primary-black
@@ -115,7 +135,8 @@
     --padding: var(--gn-ui-badge-padding, 0.375em 0.75em);
     --text-color: var(--gn-ui-badge-text-color, var(--color-gray-50));
     --background-color: var(--gn-ui-badge-background-color, black);
-    @apply inline-block opacity-70 p-[--padding] rounded-[--rounded]
+    --opacity: var(--gn-ui-badge-opacity, 0.7);
+    @apply inline-block opacity-[--opacity] p-[--padding] rounded-[--rounded]
       font-medium text-[length:0.875em] leading-none text-[color:--text-color] bg-[color:--background-color];
   }
   /* makes sure icons will not make the badges grow vertically; also make size proportional */
@@ -134,10 +155,33 @@
     @apply flex items-center justify-center px-4 py-1 text-white rounded backdrop-blur;
   }
 
+  /* GENERIC TEXT INPUT (textarea, text field, url input...) */
+  .gn-ui-text-input {
+    --rounded: var(--gn-ui-text-input-rounded, 0.25em);
+    --padding: var(--gn-ui-text-input-padding, 0.6em);
+    --font-size: var(--gn-ui-text-input-font-size, 1em);
+    --border-size: var(--gn-ui-text-input-border-size, 2px);
+    @apply appearance-none border-[length:--border-size] p-[--padding] rounded-[--rounded] w-full transition-colors duration-75
+    text-[length:--font-size] leading-none border-gray-300 text-main placeholder-gray-800
+    focus:outline-none focus:border-main hover:border-main
+    disabled:cursor-not-allowed disabled:border-gray-100 disabled:placeholder-gray-300 disabled:text-gray-700 disabled:bg-white;
+  }
+
+  /* GENERIC CARD */
+  .gn-ui-card {
+    @apply flex flex-row border border-gray-200 rounded-xl p-4 gap-2 w-full;
+  }
+
   /* TODO: add prefix */
   .card-icon {
     @apply text-primary opacity-50 group-hover:text-secondary group-hover:opacity-100 transition-colors transition-opacity;
   }
+
+  /* makes spinners appear in the right color */
+  mat-spinner circle,
+  mat-progress-spinner circle {
+    stroke: currentColor !important;
+  }
 }
 
 html {

package/translations/de.json

@@ -24,6 +24,10 @@
   "dashboard.catalog.discussion": "Diskussion",
   "dashboard.catalog.thesaurus": "Thesaurus",
   "dashboard.createRecord": "Neuer Eintrag",
+  "dashboard.importRecord": "",
+  "dashboard.importRecord.importExternal": "",
+  "dashboard.importRecord.importExternalLabel": "",
+  "dashboard.importRecord.useModel": "",
   "dashboard.labels.catalog": "Katalog",
   "dashboard.labels.mySpace": "Mein Bereich",
   "dashboard.records.all": "Katalog",
@@ -147,6 +151,27 @@
   "dataset.error.parse": "Die Daten wurden geladen, konnten aber nicht gelesen werden: \"{ info }\"",
   "dataset.error.unknown": "Die Daten können nicht angezeigt werden: \"{ info }\"",
   "dataset.error.unsupportedType": "Der folgende Inhaltstyp wird nicht unterstützt: \"{ info }\"",
+  "domain.contact.role.author": "",
+  "domain.contact.role.collaborator": "",
+  "domain.contact.role.contributor": "",
+  "domain.contact.role.custodian": "",
+  "domain.contact.role.distributor": "",
+  "domain.contact.role.editor": "",
+  "domain.contact.role.funder": "",
+  "domain.contact.role.mediator": "",
+  "domain.contact.role.originator": "",
+  "domain.contact.role.other": "",
+  "domain.contact.role.owner": "",
+  "domain.contact.role.point_of_contact": "",
+  "domain.contact.role.principal_investigator": "",
+  "domain.contact.role.processor": "",
+  "domain.contact.role.publisher": "",
+  "domain.contact.role.resource_provider": "",
+  "domain.contact.role.rights_holder": "",
+  "domain.contact.role.sponsor": "",
+  "domain.contact.role.stakeholder": "",
+  "domain.contact.role.unspecified": "",
+  "domain.contact.role.user": "",
   "domain.record.status.completed": "Abgeschlossen",
   "domain.record.status.deprecated": "Veraltet",
   "domain.record.status.ongoing": "Kontinuierliche Aktualisierung",
@@ -165,21 +190,41 @@
   "downloads.format.unknown": "unbekannt",
   "downloads.wfs.featuretype.not.found": "Der Layer wurde nicht gefunden",
   "dropFile": "Datei ablegen",
+  "editor.form.keywords.placeholder": "",
+  "editor.form.placeKeywordWithoutExtent": "",
+  "editor.record.delete.confirmation.cancelText": "Stornieren",
+  "editor.record.delete.confirmation.confirmText": "Löschen",
+  "editor.record.delete.confirmation.message": "Sind Sie sicher, dass Sie diesen Datensatz löschen möchten?",
+  "editor.record.delete.confirmation.title": "Datensatz löschen?",
+  "editor.record.deleteError.body": "Der Datensatz konnte nicht gelöscht werden:",
+  "editor.record.deleteError.closeMessage": "Verstanden",
+  "editor.record.deleteError.title": "Fehler beim Löschen des Datensatzes",
+  "editor.record.deleteSuccess.body": "",
+  "editor.record.deleteSuccess.title": "",
   "editor.record.form.bottomButtons.comeBackLater": "",
   "editor.record.form.bottomButtons.next": "",
   "editor.record.form.bottomButtons.previous": "",
-  "editor.record.form.field.abstract": "",
+  "editor.record.form.classification.opendata": "",
+  "editor.record.form.field.abstract": "Kurzbeschreibung",
+  "editor.record.form.field.contactsForResource.noContact": "",
   "editor.record.form.field.keywords": "Schlagwörter",
   "editor.record.form.field.license": "Lizenz",
-  "editor.record.form.field.recordUpdated": "",
-  "editor.record.form.field.resourceUpdated": "",
-  "editor.record.form.field.temporalExtents": "",
-  "editor.record.form.field.title": "",
-  "editor.record.form.field.uniqueIdentifier": "",
-  "editor.record.form.field.updateFrequency": "",
-  "editor.record.form.abstract": "Kurzbeschreibung",
-  "editor.record.form.keywords": "Schlüsselwörter",
-  "editor.record.form.license": "Lizenz",
+  "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineResource.cancel": "",
+  "editor.record.form.field.onlineResource.confirm": "",
+  "editor.record.form.field.onlineResource.dialogTitle": "",
+  "editor.record.form.field.onlineResource.edit.description": "",
+  "editor.record.form.field.onlineResource.edit.title": "",
+  "editor.record.form.field.onlineResource.fileSize": "",
+  "editor.record.form.field.onlineResource.modify": "",
+  "editor.record.form.field.overviews": "",
+  "editor.record.form.field.recordUpdated": "Datensatz zuletzt aktualisiert",
+  "editor.record.form.field.resourceUpdated": "Letztes Aktualisierungsdatum",
+  "editor.record.form.field.spatialExtents": "",
+  "editor.record.form.field.temporalExtents": "Zeitlicher Umfang",
+  "editor.record.form.field.title": "Metadaten-Titel",
+  "editor.record.form.field.uniqueIdentifier": "Eindeutige Kennung (ID)",
+  "editor.record.form.field.updateFrequency": "Aktualisierungshäufigkeit",
   "editor.record.form.license.cc-by": "Creative Commons CC-BY",
   "editor.record.form.license.cc-by-sa": "Creative Commons CC-BY-SA",
   "editor.record.form.license.cc-zero": "Creative Commons CC-0",
@@ -205,31 +250,43 @@
   "editor.record.form.section.dataPointOfContact.label": "",
   "editor.record.form.section.geographicalCoverage.label": "",
   "editor.record.form.section.useAndAccessConditions.label": "",
-  "editor.record.form.metadata.title": "Metadaten-Titel",
-  "editor.record.form.record.updated": "Datensatz zuletzt aktualisiert",
-  "editor.record.form.resourceUpdated": "Letztes Aktualisierungsdatum",
-  "editor.record.form.temporalExtents": "Zeitlicher Umfang",
   "editor.record.form.temporalExtents.addDate": "Zeitpunkt",
   "editor.record.form.temporalExtents.addRange": "Zeitraum",
   "editor.record.form.temporalExtents.date": "Datum",
   "editor.record.form.temporalExtents.range": "Datumsbereich",
-  "editor.record.form.unique.identifier": "Eindeutige Kennung (ID)",
-  "editor.record.form.updateFrequency": "Aktualisierungshäufigkeit",
   "editor.record.form.updateFrequency.planned": "Die Daten sollten regelmäßig aktualisiert werden.",
+  "editor.record.importFromExternalFile.failure.body": "",
+  "editor.record.importFromExternalFile.failure.title": "",
+  "editor.record.importFromExternalFile.success.body": "",
+  "editor.record.importFromExternalFile.success.title": "",
   "editor.record.loadError.body": "Der Datensatz konnte nicht geladen werden:",
   "editor.record.loadError.closeMessage": "Verstanden",
   "editor.record.loadError.title": "Fehler beim Laden des Datensatzes",
+  "editor.record.onlineResourceError.body": "",
+  "editor.record.onlineResourceError.closeMessage": "",
+  "editor.record.onlineResourceError.title": "",
+  "editor.record.placeKeywordWithoutLabel": "",
   "editor.record.publish": "Diesen Datensatz veröffentlichen",
   "editor.record.publishError.body": "Der Datensatz konnte nicht veröffentlicht werden:",
   "editor.record.publishError.closeMessage": "Verstanden",
   "editor.record.publishError.title": "Fehler beim Veröffentlichen des Datensatzes",
   "editor.record.publishSuccess.body": "Der Datensatz wurde erfolgreich veröffentlicht!",
   "editor.record.publishSuccess.title": "Veröffentlichung erfolgreich",
+  "editor.record.resourceError.body": "",
+  "editor.record.resourceError.closeMessage": "",
+  "editor.record.resourceError.title": "",
   "editor.record.saveStatus.asDraftOnly": "Nur als Entwurf gespeichert - noch nicht veröffentlicht",
   "editor.record.saveStatus.draftWithChangesPending": "Als Entwurf gespeichert - Änderungen stehen aus",
   "editor.record.saveStatus.recordUpToDate": "Datensatz ist auf dem neuesten Stand",
+  "editor.record.undo.confirmation.cancelText": "",
+  "editor.record.undo.confirmation.confirmText": "",
+  "editor.record.undo.confirmation.message": "",
+  "editor.record.undo.confirmation.title": "",
+  "editor.record.undo.tooltip.disabled": "",
+  "editor.record.undo.tooltip.enabled": "",
   "editor.record.upToDate": "Dieser Datensatz ist auf dem neuesten Stand",
   "editor.sidebar.menu.editor": "",
+  "editor.temporary.disabled": "",
   "externalviewer.dataset.unnamed": "Datensatz aus dem Datahub",
   "facets.block.title.OrgForResource": "Organisation",
   "facets.block.title.availableInServices": "Verfügbar für",
@@ -243,6 +300,11 @@
   "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>",
+  "input.file.dropFileLabel": "",
+  "input.file.orInputUrl": "",
+  "input.file.selectFileLabel": "",
+  "input.file.uploadProgressCancel": "",
+  "input.file.uploadProgressLabel": "",
   "input.image.altTextPlaceholder": "",
   "input.image.delete": "",
   "input.image.displayAltTextInput": "",
@@ -306,6 +368,7 @@
   "pagination.page": "Seite",
   "pagination.pageOf": "von",
   "previous": "zurück",
+  "record.action.delete": "Löschen",
   "record.action.download": "Herunterladen",
   "record.action.duplicate": "",
   "record.action.view": "Anzeigen",
@@ -323,7 +386,7 @@
   "record.metadata.api.form.reset": "Zurücksetzen",
   "record.metadata.api.form.title": "Benutzerdefinierte URL generieren",
   "record.metadata.api.form.type": "Ausgabeformat",
-  "record.metadata.author": "Autor",
+  "record.metadata.author": "Bearbeitet von",
   "record.metadata.catalog": "Katalog",
   "record.metadata.contact": "Kontakt",
   "record.metadata.creation": "Erstellungsdatum",
@@ -362,6 +425,8 @@
   "record.metadata.related": "Ähnliche Datensätze",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
+  "record.metadata.status.notPublished": "",
+  "record.metadata.status.published": "",
   "record.metadata.technical": "Technische Informationen",
   "record.metadata.temporalExtent": "Zeitlicher Umfang",
   "record.metadata.temporalExtent.fromDateToDate": "Von {start} bis {end}",
@@ -372,7 +437,7 @@
   "record.metadata.type": "Geographischer Datensatz",
   "record.metadata.uniqueId": "Eindeutige Kennung",
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
-  "record.metadata.updatedOn": "Letzte Aktualisierung der Dateninformationen",
+  "record.metadata.updatedOn": "Geändert am",
   "record.metadata.usage": "Nutzung und Einschränkungen",
   "record.metadata.userFeedbacks": "",
   "record.metadata.userFeedbacks.anonymousUser": "",
@@ -438,7 +503,7 @@
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.standard": "Standard",
   "search.filters.title": "Ergebnisse filtern",
-  "search.filters.topic": "Thema",
+  "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.",
   "share.tab.permalink": "Teilen",