geonetwork-ui 2.6.0-dev.3e7617888 → 2.6.0-dev.47d0cd11c

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

@@ -1,24 +1,14 @@
 import { HttpClient } from '@angular/common/http'
-import { TranslateCompiler, TranslateLoader } from '@ngx-translate/core'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
 import { FileTranslateLoader } from './file.translate.loader'
-import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-
-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')
+import {
+  TranslateCompiler,
+  TranslateDefaultParser,
+  TranslateLoader,
+  TranslateModuleConfig,
+  TranslateParser,
+} from '@ngx-translate/core'
+import { Injectable } from '@angular/core'
 
 export const DEFAULT_LANG = 'en'
 
@@ -28,20 +18,40 @@ export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 export function HttpLoaderFactory(http: HttpClient) {
   return new FileTranslateLoader(http, './assets/i18n/')
 }
-//Deprecated, but currently still used in datafeeder
-export function getLangFromBrowser() {
-  return navigator.language.substr(0, 2)
-}
-const COMPILER_CONFIG = {
-  provide: TranslateCompiler,
-  useClass: TranslateMessageFormatCompiler,
-}
-export const TRANSLATE_DEFAULT_CONFIG = {
-  compiler: COMPILER_CONFIG,
+
+export const TRANSLATE_DEFAULT_CONFIG: TranslateModuleConfig = {
+  compiler: {
+    provide: TranslateCompiler,
+    useClass: TranslateMessageFormatCompiler,
+  },
   loader: {
     provide: TranslateLoader,
     useFactory: HttpLoaderFactory,
-    defaultLanguage: DEFAULT_LANG,
     deps: [HttpClient],
   },
 }
+
+@Injectable()
+class DebugTranslateParser extends TranslateDefaultParser {
+  interpolate(expr: string | (() => string), params?: any): string | undefined {
+    if (!params) return expr?.toString()
+    const paramsStr = Object.keys(params)
+      .map((key) => `${key}=${params[key]}`)
+      .join(', ')
+    return `${expr} {{${paramsStr}}}`
+  }
+}
+
+/**
+ * This config will print translation keys in the UI directly; used to identify which keys are used
+ */
+export const TRANSLATE_DEBUG_CONFIG: TranslateModuleConfig = {
+  compiler: {
+    provide: TranslateCompiler,
+    useClass: TranslateMessageFormatCompiler,
+  },
+  parser: {
+    provide: TranslateParser,
+    useClass: DebugTranslateParser,
+  },
+}

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

@@ -1,25 +1,27 @@
-import { Injectable } from '@angular/core'
 import {
-  HttpRequest,
-  HttpHandler,
   HttpEvent,
+  HttpHandler,
   HttpInterceptor,
+  HttpRequest,
 } from '@angular/common/http'
-import { TranslateService } from '@ngx-translate/core'
-import { Observable } from 'rxjs'
 import { DEFAULT_LANG } from './i18n.constants'
+import { Observable } from 'rxjs'
+import { Injectable, Injector } from '@angular/core'
+import { TranslateService } from '@ngx-translate/core'
 
 @Injectable()
 export class I18nInterceptor implements HttpInterceptor {
-  constructor(private translate: TranslateService) {}
+  constructor(private injector: Injector) {}
 
   intercept(
-    request: HttpRequest<any>,
+    request: HttpRequest<unknown>,
     next: HttpHandler
-  ): Observable<HttpEvent<any>> {
+  ): Observable<HttpEvent<unknown>> {
+    // we're injecting the service only when necessary to avoid circular dependencies
+    const translate = this.injector.get(TranslateService)
     request = request.clone({
       setHeaders: {
-        'Accept-Language': this.translate.currentLang || DEFAULT_LANG,
+        'Accept-Language': translate.currentLang || DEFAULT_LANG,
       },
     })
     return next.handle(request)

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 {