geonetwork-ui 2.6.0-dev.025a2f85d → 2.6.0-dev.02631a41f

package/src/libs/util/i18n/src/lib/i18n.providers.ts

@@ -0,0 +1,68 @@
+import {
+  APP_INITIALIZER,
+  EnvironmentProviders,
+  makeEnvironmentProviders,
+  Provider,
+} from '@angular/core'
+import {
+  provideTranslateService,
+  TranslateModuleConfig,
+  TranslateService,
+} from '@ngx-translate/core'
+import {
+  DEFAULT_LANG,
+  LANGUAGE_STORAGE_KEY,
+  TRANSLATE_DEBUG_CONFIG,
+  TRANSLATE_DEFAULT_CONFIG,
+} from './i18n.constants'
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http'
+import { I18nInterceptor } from './i18n.interceptor'
+
+function i18nInitializerFromLocalStorageFactory(translate: TranslateService) {
+  return () => {
+    translate.setDefaultLang(DEFAULT_LANG)
+    let storageLang = null
+    try {
+      storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
+    } catch (error) {
+      console.warn(error)
+    }
+    translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
+  }
+}
+
+export function provideI18n(
+  config?: TranslateModuleConfig,
+  useLocalStorage = true
+): EnvironmentProviders {
+  // fallback to default config
+  let usedConfig = config ?? TRANSLATE_DEFAULT_CONFIG
+  // if the URL contains ?debugTranslations=true, show translations keys in the UI
+  if (
+    new URL(window.location.toString()).searchParams.get(
+      'debugTranslations'
+    ) === 'true'
+  ) {
+    usedConfig = TRANSLATE_DEBUG_CONFIG
+  }
+
+  const providers: (EnvironmentProviders | Provider)[] = [
+    provideHttpClient(withInterceptorsFromDi()),
+    { provide: HTTP_INTERCEPTORS, useClass: I18nInterceptor, multi: true },
+    provideTranslateService(usedConfig),
+  ]
+  if (useLocalStorage) {
+    providers.push({
+      provide: APP_INITIALIZER,
+      useFactory: i18nInitializerFromLocalStorageFactory,
+      deps: [TranslateService],
+      multi: true,
+    })
+  }
+
+  return makeEnvironmentProviders(providers)
+}

package/src/libs/util/i18n/src/lib/language-codes.ts

@@ -1,4 +1,6 @@
-export const LANG_3_TO_2_MAPPER = {
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+
+const LANG_3_TO_2_MAPPER = {
   eng: 'en',
   dut: 'nl',
   fre: 'fr',
@@ -15,6 +17,17 @@ export const LANG_3_TO_2_MAPPER = {
   chi: 'zh',
   slo: 'sk',
   roh: 'rm',
+  ara: 'ar',
+  dan: 'da',
+  nor: 'no',
+  pol: 'pl',
+  swe: 'sv',
+  tur: 'tr',
+  arm: 'hy',
+  aze: 'az',
+  geo: 'ka',
+  ukr: 'uk',
+  wel: 'cy',
 }
 
 export const LANGUAGE_NAMES = {
@@ -33,7 +46,18 @@ export const LANGUAGE_NAMES = {
   ru: 'Русский',
   zh: '中文',
   sk: 'Slovenčina',
-  roh: 'Rumantsch',
+  rm: 'Rumantsch',
+  ar: 'العربية',
+  da: 'Dansk',
+  no: 'Norsk',
+  pl: 'Polski',
+  sv: 'Swedish',
+  tr: 'Türkçe',
+  hy: 'հայերեն',
+  az: 'Azərbaycan dili',
+  ka: 'ქართული',
+  uk: 'українська',
+  wel: 'Cymraeg',
 }
 
 export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
@@ -42,3 +66,44 @@ export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
   },
   {}
 )
+
+export function getLang3FromLang2(lang2: string): string {
+  return LANG_2_TO_3_MAPPER[lang2] ?? lang2
+}
+
+export function getLang2FromLang3(lang3: string): string {
+  return LANG_3_TO_2_MAPPER[lang3] ?? lang3
+}
+
+export function getLocalizedIndexKey(lang2: string): string {
+  const lang3 = getLang3FromLang2(lang2)
+  return lang3 ? `lang${lang3}` : null
+}
+
+marker('language.en')
+marker('language.nl')
+marker('language.fr')
+marker('language.de')
+marker('language.ko')
+marker('language.es')
+marker('language.cs')
+marker('language.ca')
+marker('language.fi')
+marker('language.is')
+marker('language.it')
+marker('language.pt')
+marker('language.ru')
+marker('language.zh')
+marker('language.sk')
+marker('language.rm')
+marker('language.ar')
+marker('language.da')
+marker('language.no')
+marker('language.pl')
+marker('language.sv')
+marker('language.tr')
+marker('language.hy')
+marker('language.az')
+marker('language.ka')
+marker('language.uk')
+marker('language.cy')

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

@@ -1,6 +1,6 @@
-export * from './lib/util-shared.module'
 export * from './lib/services'
 export * from './lib/utils'
 export * from './lib/links'
 export * from './lib/image-fallback.directive'
 export * from './lib/gn-ui-version'
+export * from './lib/record.util'

package/src/libs/util/shared/src/lib/image-fallback.directive.ts

@@ -2,6 +2,7 @@ import { Directive, ElementRef, HostListener, Input } from '@angular/core'
 
 @Directive({
   selector: 'img[gnUiImageFallback]',
+  standalone: true,
 })
 export class ImageFallbackDirective {
   @Input() fallbackUrl: string

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

@@ -31,7 +31,10 @@ export class LinkClassifierService {
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'wms':
           case 'wmts':
+          case 'tms':
             return [LinkUsage.API, LinkUsage.MAP_API]
+          case 'maplibre-style':
+            return [LinkUsage.GEODATA]
           case 'ogcFeatures':
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'GPFDL':

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

@@ -247,6 +247,9 @@ export function getLinkLabel(
           case 'wmts':
             format = 'WMTS'
             break
+          case 'tms':
+            format = 'TMS'
+            break
           case 'esriRest':
             format = 'REST'
             break

package/src/libs/util/shared/src/lib/record.util.ts

@@ -0,0 +1,114 @@
+import {
+  BaseRecord,
+  CatalogRecord,
+  Constraint,
+  DatasetDownloadDistribution,
+  DatasetServiceDistribution,
+  DatasetSpatialExtent,
+  Keyword,
+  LanguageCode,
+  OnlineLinkResource,
+  Organization,
+  ServiceEndpoint,
+} from '../../../../../libs/common/domain/src/lib/model/record'
+
+type TranslatedRecordObjects =
+  | BaseRecord
+  | Constraint
+  | Keyword
+  | DatasetServiceDistribution
+  | DatasetDownloadDistribution
+  | OnlineLinkResource
+  | ServiceEndpoint
+  | DatasetSpatialExtent
+  | Organization
+
+export function updateLanguages<T extends CatalogRecord>(
+  record: T,
+  defaultLanguage: LanguageCode,
+  otherLanguages: LanguageCode[]
+): T {
+  function updateFieldTranslations<T extends TranslatedRecordObjects>(
+    target: T,
+    fieldName: string
+  ): T {
+    const fieldTranslations = {}
+    for (const lang of otherLanguages) {
+      const prevValue =
+        record.defaultLanguage === lang
+          ? target[fieldName]
+          : target.translations?.[fieldName]?.[lang]
+      fieldTranslations[lang] = prevValue ?? ''
+    }
+    const defaultPrevValue =
+      record.defaultLanguage === defaultLanguage
+        ? target[fieldName]
+        : target.translations?.[fieldName]?.[defaultLanguage]
+    return {
+      ...target,
+      [fieldName]: defaultPrevValue ?? '',
+      translations: {
+        ...target.translations,
+        [fieldName]: fieldTranslations,
+      },
+    }
+  }
+  function updateTranslations<T extends TranslatedRecordObjects>(
+    target: T,
+    fieldNames: string[]
+  ): T {
+    let result: T = target
+    for (const field of fieldNames) {
+      result = updateFieldTranslations(result, field)
+    }
+    return result
+  }
+
+  const updatedRecord = updateTranslations(record, [
+    'title',
+    'abstract',
+    'lineage',
+  ])
+  updatedRecord.keywords = updatedRecord.keywords.map((k) =>
+    updateTranslations(k, ['label', 'description'])
+  )
+  updatedRecord.onlineResources = updatedRecord.onlineResources.map((o) =>
+    updateTranslations(o, ['name', 'description'])
+  )
+  updatedRecord.licenses = updatedRecord.licenses.map((l) =>
+    updateTranslations(l, ['text'])
+  )
+  updatedRecord.legalConstraints = updatedRecord.legalConstraints.map((c) =>
+    updateTranslations(c, ['text'])
+  )
+  updatedRecord.securityConstraints = updatedRecord.securityConstraints.map(
+    (c) => updateTranslations(c, ['text'])
+  )
+  updatedRecord.otherConstraints = updatedRecord.otherConstraints.map((c) =>
+    updateTranslations(c, ['text'])
+  )
+  updatedRecord.contacts = updatedRecord.contacts.map((c) => ({
+    ...c,
+    organization: updateTranslations(c.organization, ['name']),
+  }))
+  updatedRecord.contactsForResource = updatedRecord.contactsForResource.map(
+    (c) => ({
+      ...c,
+      organization: updateTranslations(c.organization, ['name']),
+    })
+  )
+  updatedRecord.ownerOrganization = updateTranslations(
+    updatedRecord.ownerOrganization,
+    ['name']
+  )
+
+  if (updatedRecord.kind === 'dataset') {
+    updatedRecord.spatialExtents = updatedRecord.spatialExtents.map((e) =>
+      updateTranslations(e, ['description'])
+    )
+  }
+
+  updatedRecord.defaultLanguage = defaultLanguage
+  updatedRecord.otherLanguages = otherLanguages
+  return updatedRecord
+}

package/tailwind.base.config.js

@@ -1,6 +1,9 @@
 module.exports = {
   theme: {
     extend: {
+      screens: {
+        xs: '320px',
+      },
       colors: {
         'primary-white': 'var(--color-primary-white)',
         'primary-lightest': 'var(--color-primary-lightest)',

package/tailwind.base.css

@@ -131,23 +131,11 @@
   .gn-ui-btn-light {
     @apply gn-ui-btn
       hover:bg-gray-50 focus:bg-gray-50 active:bg-gray-100
-      border-white focus:ring-4 focus:ring-gray-300;
-  }
-
-  .gn-ui-card-xs {
-    @apply min-h-[68px] md:w-[487px];
+      bg-white border-white focus:ring-4 focus:ring-gray-300;
   }
 
   .gn-ui-card-s {
-    @apply min-h-[135px] md:w-80;
-  }
-
-  .gn-ui-card-m {
-    @apply min-h-[68px] md:w-[487px];
-  }
-
-  .gn-ui-card-l {
-    @apply min-h-[68px] md:w-[992px];
+    @apply min-h-[64px] w-full xs:min-w-[260px] xs:max-w-[280px] sm:min-w-[300px] sm:max-w-[500px] md:min-w-[230px];
   }
 
   .gn-ui-card-title {
@@ -197,7 +185,7 @@
 
   /* TODO: replace by gn-ui-badge class above */
   .badge-btn {
-    @apply flex items-center justify-center px-4 py-1 text-white rounded backdrop-blur;
+    @apply flex items-center justify-center px-4 py-1 rounded backdrop-blur;
   }
 
   /* GENERIC TEXT INPUT (textarea, text field, url input...) */

package/translations/de.json

@@ -30,6 +30,7 @@
   "dashboard.labels.mySpace": "Mein Bereich",
   "dashboard.records.all": "Metadatenkatalog",
   "dashboard.records.hasDraft": "",
+  "dashboard.records.isMultilingual": "Dieser Eintrag ist mehrsprachig ({languages})",
   "dashboard.records.myDraft": "Meine Entwürfe",
   "dashboard.records.myRecords": "Meine Datensätze",
   "dashboard.records.search": "Suche nach \"{searchText}\"",
@@ -37,21 +38,7 @@
   "dashboard.records.userEmail": "E-Mail",
   "dashboard.records.username": "Benutzername",
   "dashboard.records.users": "{count, plural, =1{Benutzer} other{Benutzer}}",
-  "datafeeder.month.april": "April",
-  "datafeeder.month.august": "August",
-  "datafeeder.month.december": "Dezember",
-  "datafeeder.month.february": "Februar",
-  "datafeeder.month.january": "Januar",
-  "datafeeder.month.july": "Juli",
-  "datafeeder.month.june": "Juni",
-  "datafeeder.month.march": "März",
-  "datafeeder.month.may": "Mai",
-  "datafeeder.month.november": "November",
-  "datafeeder.month.october": "Oktober",
-  "datafeeder.month.september": "September",
-  "datafeeder.wizardSummarize.createdAt": "Erstellt am",
-  "datafeeder.wizardSummarize.scale": "Maßstab",
-  "datahub.header.datasets": "Datensätze",
+  "datahub.header.datasets": "Katalog",
   "datahub.header.lastRecords": "Die neuesten",
   "datahub.header.myfavorites": "Meine Favoriten",
   "datahub.header.news": "Startseite",
@@ -204,6 +191,13 @@
   "editor.record.form.license.odc-by": "",
   "editor.record.form.license.pddl": "",
   "editor.record.form.license.unknown": "",
+  "editor.record.form.multilingual.activate": "",
+  "editor.record.form.multilingual.default": "",
+  "editor.record.form.multilingual.enable": "",
+  "editor.record.form.multilingual.forbidden": "",
+  "editor.record.form.multilingual.open": "",
+  "editor.record.form.multilingual.title": "",
+  "editor.record.form.multilingual.validate": "",
   "editor.record.form.page.accessAndContact": "",
   "editor.record.form.page.description": "",
   "editor.record.form.page.resources": "",
@@ -233,8 +227,13 @@
   "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.lock.format": "",
-  "editor.record.lock.reason": "",
+  "editor.record.lock.harvested": "",
+  "editor.record.lock.owner": "",
+  "editor.record.lock.resourceType": "",
+  "editor.record.multilingual.confirmation.cancelText": "",
+  "editor.record.multilingual.confirmation.confirmText": "",
+  "editor.record.multilingual.confirmation.message": "",
+  "editor.record.multilingual.confirmation.title": "",
   "editor.record.onlineResource.protocol.other": "",
   "editor.record.onlineResourceError.body": "",
   "editor.record.onlineResourceError.closeMessage": "",
@@ -281,6 +280,12 @@
   "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",
+  "feature.catalog.attribute.code": "Code",
+  "feature.catalog.attribute.definition": "Beschreibung",
+  "feature.catalog.attribute.name": "Name",
+  "feature.catalog.attribute.type": "Typ",
+  "feature.catalog.attribute.values": "Werte",
   "input.file.dropFileLabel": "",
   "input.file.orInputUrl": "",
   "input.file.selectFileLabel": "",
@@ -295,20 +300,32 @@
   "input.image.uploadErrorLabel": "",
   "input.image.uploadProgressCancel": "",
   "input.image.uploadProgressLabel": "",
+  "language.ar": "",
+  "language.az": "",
   "language.ca": "Katalanisch",
   "language.cs": "Tschechisch",
+  "language.cy": "",
+  "language.da": "",
   "language.de": "Deutsch",
   "language.en": "Englisch",
   "language.es": "Spanisch",
   "language.fi": "Finnisch",
   "language.fr": "Französisch",
+  "language.hy": "",
   "language.is": "Isländisch",
   "language.it": "Italienisch",
+  "language.ka": "",
   "language.ko": "Koreanisch",
   "language.nl": "Niederländisch",
+  "language.no": "",
+  "language.pl": "",
   "language.pt": "Portugiesisch",
+  "language.rm": "",
   "language.ru": "Russisch",
   "language.sk": "Slowakisch",
+  "language.sv": "",
+  "language.tr": "",
+  "language.uk": "",
   "language.zh": "Chinesisch",
   "map.add.layer": "Eine Ebene hinzufügen",
   "map.add.layer.catalog": "Aus dem Katalog",
@@ -328,12 +345,12 @@
   "map.navigation.message": "Bitte verwenden Sie STRG + Maus (oder zwei Finger auf einem Mobilgerät), um die Karte zu navigieren",
   "map.ogc.urlInput.hint": "",
   "map.select.layer": "Datenquelle",
+  "map.select.style": "Style",
   "map.wfs.urlInput.hint": "Geben Sie die WFS URL ein",
   "map.wms.urlInput.hint": "Geben Sie die WMS URL ein",
   "multiselect.filter.placeholder": "Suche",
   "nav.back": "Zurück",
   "navbar.mobile.menuTitle": "Schnellzugriff",
-  "next": "weiter",
   "ogc.unreachable.unknown": "Der Dienst konnte nicht erreicht werden",
   "organisation.filter.placeholder": "Ergebnisse filtern",
   "organisation.sort.sortBy": "Sortieren nach:",
@@ -349,17 +366,18 @@
   "pagination.nextPage": "Nächste Seite",
   "pagination.page": "Seite",
   "pagination.pageOf": "von",
-  "previous": "zurück",
   "record.action.delete": "Löschen",
   "record.action.download": "Herunterladen",
   "record.action.duplicate": "",
   "record.action.duplicating": "",
   "record.action.rollback": "",
+  "record.action.switchLang": "",
   "record.action.view": "Anzeigen",
   "record.card.metadata.contact": "",
   "record.externalViewer.open": "In externem Kartenviewer öffnen",
+  "record.feature.catalog.number.total.attribute": "",
+  "record.feature.catalog.number.total.object": "",
   "record.feature.limit": "Die Vorschau wurde aufgrund zu vieler Elemente deaktiviert",
-  "record.kind.data": "",
   "record.kind.dataset": "",
   "record.kind.reuse": "",
   "record.kind.service": "",
@@ -402,10 +420,17 @@
   "record.metadata.creation": "Erstellungsdatum",
   "record.metadata.details": "Über die Daten",
   "record.metadata.download": "Downloads",
+  "record.metadata.feature.catalog": "",
   "record.metadata.formats": "Formate",
+  "record.metadata.isGeographical": "Geographischer Datensatz",
   "record.metadata.keywords": "Stichworte",
   "record.metadata.languages": "Sprachen",
   "record.metadata.lastUpdate": "Zuletzt aktualisiert am {date}",
+  "record.metadata.linked.datasets": "Verknüpfte Datensätze",
+  "record.metadata.linked.records": "Verknüpfte Inhalte",
+  "record.metadata.linked.reuses": "Verknüpfte Wiederverwendungen",
+  "record.metadata.linked.services": "Verknüpfte Dienste",
+  "record.metadata.linked.sourceDatasets": "Quelldatensätze",
   "record.metadata.links": "Links",
   "record.metadata.noUsage": "Für diesen Datensatz sind keine Nutzungsbedingungen angegeben.",
   "record.metadata.otherConstraints": "Zusätzliche Bedingungen",
@@ -415,6 +440,8 @@
   "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.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",
@@ -426,14 +453,15 @@
   "record.metadata.quality.legalConstraints.success": "Rechtliche Beschränkungen angegeben",
   "record.metadata.quality.organisation.failed": "Organisation nicht angegeben",
   "record.metadata.quality.organisation.success": "Organisation angegeben",
+  "record.metadata.quality.source.failed": "",
+  "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.updateFrequency.failed": "Aktualisierungsfrequenz nicht angegeben",
   "record.metadata.quality.updateFrequency.success": "Aktualisierungsfrequenz angegeben",
-  "record.metadata.related": "Ähnliche Datensätze",
-  "record.metadata.related.contents": "",
+  "record.metadata.related": "Entdecken Sie den Katalog",
   "record.metadata.ressources.and.links": "Ressourcen und Links",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
@@ -445,7 +473,6 @@
   "record.metadata.temporalExtent.untilDate": "Bis {end}",
   "record.metadata.title": "Titel",
   "record.metadata.topics": "Kategorien",
-  "record.metadata.type": "Geographischer Datensatz",
   "record.metadata.uniqueId": "Eindeutige Kennung",
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
   "record.metadata.updatedOn": "Geändert am",
@@ -485,6 +512,7 @@
   "search.error.recordNotFound": "Der Datensatz 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": "",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Letzte Aktualisierung",
@@ -515,6 +543,10 @@
   "search.filters.producerOrg": "",
   "search.filters.publicationYear": "Veröffentlichungsjahr",
   "search.filters.publisherOrg": "",
+  "search.filters.recordKind.all": "Alle",
+  "search.filters.recordKind.dataset": "Datensätze",
+  "search.filters.recordKind.reuse": "Wiederverwendungen",
+  "search.filters.recordKind.service": "Dienste",
   "search.filters.representationType": "Repräsentationstyp",
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.standard": "Standard",
@@ -544,6 +576,7 @@
   "service.metadata.other": "",
   "service.metadata.question": "",
   "service.metadata.search": "",
+  "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",
   "share.tab.permalink": "Teilen",
   "share.tab.webComponent": "Integrieren",
@@ -559,7 +592,6 @@
   "tooltip.html.copy": "HTML kopieren",
   "tooltip.id.copy": "Eindeutige Kennung kopieren",
   "tooltip.url.copy": "URL kopieren",
-  "tooltip.url.open": "URL öffnen",
   "ui.readLess": "Weniger lesen",
   "ui.readMore": "Weiterlesen",
   "wfs.feature.limit": "Zu viele Features, um den WFS-Layer anzuzeigen!",