geonetwork-ui 2.7.0-dev.dbe423d28 → 2.7.0-dev.ed54e0aff

package/src/libs/ui/elements/src/lib/metadata-quality/metadata-quality.component.ts

@@ -14,15 +14,16 @@ import {
   PopoverComponent,
   ProgressBarComponent,
 } from '../../../../../../libs/ui/widgets/src'
+import {
+  getQualityValidators,
+  getAllKeysValidator,
+  type ValidatorMapperKeys,
+} from '../../../../../../libs/util/shared/src'
 import { CommonModule } from '@angular/common'
 import { TranslateDirective } from '@ngx-translate/core'
 import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { matInfoOutline } from '@ng-icons/material-icons/outline'
 
-type QualityChecks = {
-  [key: string]: (metadata: Partial<CatalogRecord>) => boolean
-}
-
 @Component({
   selector: 'gn-ui-metadata-quality',
   templateUrl: './metadata-quality.component.html',
@@ -48,77 +49,39 @@ type QualityChecks = {
   ],
 })
 export class MetadataQualityComponent implements OnChanges {
-  @Input() metadata: Partial<CatalogRecord>
+  @Input() metadata: CatalogRecord
   @Input() smaller = false
   @Input() metadataQualityDisplay: boolean
+  @Input() popoverDisplay = true
+  @Input() propsToValidate?: ValidatorMapperKeys[]
+  @Input() forceComputeScore = false // Instead of returning es' quality score
 
   items: MetadataQualityItem[] = []
 
   get qualityScore() {
-    const qualityScore = this.metadata?.extras?.qualityScore
+    const qualityScore = !this.forceComputeScore
+      ? this.metadata?.extras?.qualityScore
+      : this.computedQualityScore
+
     return typeof qualityScore === 'number'
       ? qualityScore
-      : this.calculatedQualityScore
+      : this.computedQualityScore
   }
 
-  get calculatedQualityScore(): number {
+  get computedQualityScore(): number {
     return Math.round(
       (this.items.filter(({ value }) => value).length * 100) / this.items.length
     )
   }
 
-  private add(name: string, value: boolean) {
-    if (this.metadataQualityDisplay?.[name] !== false) {
-      this.items.push({ name, value })
-    }
-  }
-  hasGetCapabilities(url: string): boolean {
-    return url.toLowerCase().includes('capabilities')
-  }
-
-  private readonly COMMON_CHECKS: QualityChecks = {
-    title: (metadata) => !!metadata?.title,
-    description: (metadata) => !!metadata?.abstract,
-    keywords: (metadata) => (metadata?.keywords?.length ?? 0) > 0,
-    legalConstraints: (metadata) =>
-      (metadata?.legalConstraints?.length ?? 0) > 0,
-    contact: (metadata) => !!metadata?.contacts?.[0]?.email,
-  }
-
-  private readonly SPECIFIC_CHECKS: Record<string, QualityChecks> = {
-    dataset: {
-      updateFrequency: (metadata) => !!metadata?.updateFrequency,
-      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
-      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
-    },
-    service: {
-      capabilities: (metadata) =>
-        (metadata?.onlineResources ?? []).some((resource) =>
-          this.hasGetCapabilities(resource?.url?.href ?? '')
-        ),
-    },
-    reuse: {
-      topic: (metadata) => (metadata?.topics?.length ?? 0) > 0,
-      organisation: (metadata) => !!metadata?.contacts?.[0]?.organization?.name,
-      source: (metadata) => !!metadata?.extras?.sourcesIdentifiers,
-    },
-  }
-
   initialize() {
-    this.items = []
-
-    Object.entries(this.COMMON_CHECKS).forEach(([name, check]) => {
-      this.add(name, check(this.metadata))
-    })
-
-    const datasetType = this.metadata?.kind
-    if (datasetType && this.SPECIFIC_CHECKS[datasetType]) {
-      Object.entries(this.SPECIFIC_CHECKS[datasetType]).forEach(
-        ([name, check]) => {
-          this.add(name, check(this.metadata))
-        }
-      )
+    if (!this.propsToValidate) {
+      this.propsToValidate = getAllKeysValidator()
     }
+
+    this.items = getQualityValidators(this.metadata, this.propsToValidate).map(
+      ({ name, validator }) => ({ name, value: validator() })
+    )
   }
 
   ngOnChanges(changes: SimpleChanges): void {

package/src/libs/ui/elements/src/lib/metadata-quality-item/metadata-quality-item.component.ts

@@ -6,16 +6,16 @@ import { matCheck, matWarningAmber } from '@ng-icons/material-icons/baseline'
 
 marker('record.metadata.quality.title.success')
 marker('record.metadata.quality.title.failed')
-marker('record.metadata.quality.description.success')
-marker('record.metadata.quality.description.failed')
-marker('record.metadata.quality.topic.success')
-marker('record.metadata.quality.topic.failed')
+marker('record.metadata.quality.abstract.success')
+marker('record.metadata.quality.abstract.failed')
+marker('record.metadata.quality.topics.success')
+marker('record.metadata.quality.topics.failed')
 marker('record.metadata.quality.keywords.success')
 marker('record.metadata.quality.keywords.failed')
 marker('record.metadata.quality.legalConstraints.success')
 marker('record.metadata.quality.legalConstraints.failed')
-marker('record.metadata.quality.contact.success')
-marker('record.metadata.quality.contact.failed')
+marker('record.metadata.quality.contacts.success')
+marker('record.metadata.quality.contacts.failed')
 marker('record.metadata.quality.updateFrequency.success')
 marker('record.metadata.quality.updateFrequency.failed')
 marker('record.metadata.quality.organisation.success')

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts

@@ -136,12 +136,6 @@ export class ServiceCapabilitiesComponent implements OnInit {
   }
 
   selectLayer(layer: WfsFeatureTypeFull | WmsLayerFull | WmtsLayer) {
-    if (layer === this.selectedLayer) {
-      this.selectedLayer = null
-      this.layerInformation = []
-      return
-    }
-
     this.selectedLayer = layer
     const filteredInfo = []
     Object.keys(layer).map((key) => {

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.html

@@ -1,5 +1,8 @@
 <div
   class="flex items-center justify-between p-3 mt-8 bg-white rounded-lg border-b solid border-gray-300"
+  *ngIf="
+    (isMobile$ | async) === false || featureCatalog?.featureTypes?.length > 1
+  "
 >
   <div
     class="relative shrink-0"
@@ -17,7 +20,10 @@
       name="iconoirSearch"
     ></ng-icon>
   </div>
-  <div class="text-sm px-1 ml-auto hidden sm:inline">
+  <div
+    *ngIf="(isMobile$ | async) === false"
+    class="text-sm px-1 ml-auto inline"
+  >
     <ng-container *ngIf="featureCatalog?.featureTypes?.length > 1">
       <span
         class="text-sm font-medium text-gray-900"

package/src/libs/ui/inputs/src/lib/search-feature-catalog/search-feature-catalog.component.ts

@@ -6,7 +6,7 @@ import { DatasetFeatureCatalog } from '../../../../../../libs/common/domain/src/
 import { FormsModule } from '@angular/forms'
 import { of } from 'rxjs'
 import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators'
-import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { createFuzzyFilter, getIsMobile } from '../../../../../../libs/util/shared/src'
 import { iconoirSearch } from '@ng-icons/iconoir'
 
 @Component({
@@ -39,6 +39,8 @@ export class SearchFeatureCatalogComponent {
     return this._featureCatalog
   }
 
+  isMobile$ = getIsMobile()
+
   @Output() filteredFeatureCatalogChange =
     new EventEmitter<DatasetFeatureCatalog>()
   filteredFeatureCatalog: DatasetFeatureCatalog

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

@@ -102,6 +102,7 @@ export function loadAppConfig() {
           'web_component_embedder_url',
           'languages',
           'contact_email',
+          'reuse_form_url',
         ],
         warnings,
         errors
@@ -131,6 +132,7 @@ export function loadAppConfig() {
                 parsedGlobalSection.web_component_embedder_url,
               LANGUAGES: parsedGlobalSection.languages,
               CONTACT_EMAIL: parsedGlobalSection.contact_email,
+              REUSE_FORM_URL: parsedGlobalSection.reuse_form_url,
             } as GlobalConfig)
 
       const parsedLayersSections = parseMultiConfigSection(
@@ -229,6 +231,7 @@ export function loadAppConfig() {
           'filter_geometry_url',
           'search_preset',
           'advanced_filters',
+          'limit',
         ],
         warnings,
         errors
@@ -255,6 +258,7 @@ export function loadAppConfig() {
                 filters: param.filters,
               })),
               ADVANCED_FILTERS: parsedSearchSection.advanced_filters,
+              LIMIT: parsedSearchSection.limit,
             } as SearchConfig)
 
       const parsedMetadataQualitySection = parseConfigSection(

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

@@ -124,7 +124,7 @@ export const wrongLanguageCodeConfigFixture = () => `
 [global]
 geonetwork4_api_url = "/geonetwork/srv/api"
 proxy_path = "/proxy/?url="
-metadata_language = "fra"
+metadata_language = "abc"
 
 [map]
 

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

@@ -11,6 +11,7 @@ export interface GlobalConfig {
   WEB_COMPONENT_EMBEDDER_URL?: string
   LANGUAGES?: string[]
   CONTACT_EMAIL?: string
+  REUSE_FORM_URL?: string
 }
 
 export interface LayerConfig {
@@ -59,6 +60,7 @@ export interface SearchConfig {
   FILTER_GEOMETRY_DATA?: string
   SEARCH_PRESET?: SearchPreset[]
   ADVANCED_FILTERS?: []
+  LIMIT?: number
 }
 
 export interface MetadataQualityConfig {

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -1,4 +1,4 @@
-import { LANGUAGE_CODES_ISO_3 } from './constants'
+import { toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -129,13 +129,10 @@ export function checkMetadataLanguage(
   parsedConfigSection: any,
   outWarnings: string[]
 ) {
-  if (
-    LANGUAGE_CODES_ISO_3.indexOf(
-      parsedConfigSection.metadata_language.toLowerCase()
-    ) === -1
-  ) {
+  const lang2 = toLang2(parsedConfigSection.metadata_language.toLowerCase())
+  if (lang2?.length !== 2) {
     outWarnings.push(
-      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not in ISO 639-2/B format`
+      `In the [global] section: metadata_language = "${parsedConfigSection.metadata_language}" is not a recognized ISO 639 language code`
     )
   }
   return parsedConfigSection

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

@@ -1,20 +1,32 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 
+/**
+ * Taken from https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
+ * Note: some languages have multiple 3-char codes, like 'fre' and 'fra'; in that case, the one to be used
+ * in priority is the one defined last
+ */
 const LANG_3_TO_2_MAPPER = {
   eng: 'en',
+  nld: 'nl', // duplicate for "dut"
   dut: 'nl',
+  fra: 'fr', // duplicate for "fre"
   fre: 'fr',
+  deu: 'de', // duplicate for "ger"
   ger: 'de',
   kor: 'ko',
   spa: 'es',
+  ces: 'cs', // duplicate for "cze"
   cze: 'cs',
   cat: 'ca',
   fin: 'fi',
+  isl: 'is', // duplicate for "ice"
   ice: 'is',
   ita: 'it',
   por: 'pt',
   rus: 'ru',
+  zho: 'zh', // duplicate for "chi"
   chi: 'zh',
+  slk: 'sk', // duplicate for "slo"
   slo: 'sk',
   roh: 'rm',
   ara: 'ar',
@@ -25,10 +37,12 @@ const LANG_3_TO_2_MAPPER = {
   tur: 'tr',
   arm: 'hy',
   aze: 'az',
+  kat: 'ka', // duplicate for "geo"
   geo: 'ka',
   ukr: 'uk',
+  cym: 'cy', // duplicate for "wel"
   wel: 'cy',
-}
+} as const
 
 export const LANGUAGE_NAMES = {
   en: 'English',
@@ -58,26 +72,63 @@ export const LANGUAGE_NAMES = {
   ka: 'ქართული',
   uk: 'українська',
   wel: 'Cymraeg',
-}
+} as const
+
+export type LanguageCode3 = keyof typeof LANG_3_TO_2_MAPPER
+export type LanguageCode2 = (typeof LANG_3_TO_2_MAPPER)[LanguageCode3]
 
 export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
   (mapperObject, langEntry) => {
     return { ...mapperObject, [langEntry[1]]: langEntry[0] }
   },
   {}
-)
+) as Record<LanguageCode2, LanguageCode3>
 
-export function getLang3FromLang2(lang2: string): string {
-  return LANG_2_TO_3_MAPPER[lang2] ?? lang2
-}
+/**
+ * This can be:
+ * - an ISO 639-2 language code in 3 characters (e.g. 'eng', 'fre', 'ger')
+ * - an ISO 639-1 language code in 2 characters (e.g. 'en', 'fr', 'de')
+ * - a 2-character language code with locale (e.g. 'fr_FR', 'fr_CA')
+ */
+export type LanguageCodeLike = LanguageCode2 | LanguageCode3 | string
 
-export function getLang2FromLang3(lang3: string): string {
-  return LANG_3_TO_2_MAPPER[lang3] ?? lang3
+/**
+ * Converts a language code in any format to the ISO 639-2 format (3 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang3(lang: LanguageCodeLike): LanguageCode3 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_2_TO_3_MAPPER[LANG_3_TO_2_MAPPER[lang.toLowerCase()]] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  return LANG_2_TO_3_MAPPER[lang2] ?? lang
 }
 
-export function getLocalizedIndexKey(lang2: string): string {
-  const lang3 = getLang3FromLang2(lang2)
-  return lang3 ? `lang${lang3}` : null
+/**
+ * Converts a language code in any format to the ISO 639-1 format (2 characters)
+ * Returns the given string if the corresponding language code could not be recognized
+ */
+export function toLang2(lang: LanguageCodeLike): LanguageCode2 | string {
+  if (!lang) {
+    // also handle falsy values just in case
+    return lang
+  }
+  if (lang.length === 3) {
+    return LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang
+  }
+  const lang2 = lang.toLowerCase().substring(0, 2)
+  if (lang2 in LANG_2_TO_3_MAPPER) {
+    return lang2
+  }
+  if (lang.match(/[a-z]{2}_[A-Z]{2}/)) {
+    // remove locale code even if the language code is not known
+    return lang2
+  }
+  return lang
 }
 
 marker('language.en')

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

@@ -3,4 +3,4 @@ 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'
+export * from './lib/record'

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

@@ -23,8 +23,8 @@ export const FORMATS = {
   excel: {
     extensions: [
       'excel',
-      'xls',
       'xlsx',
+      'xls',
       'ms-excel',
       'openxmlformats-officedocument',
     ],
@@ -190,6 +190,7 @@ export function isFormatInQueryParam(
   alias: string
 ): boolean {
   const queryParams = link.url.searchParams
+  if (!queryParams) return false
   for (const [key, value] of queryParams.entries()) {
     if (key === 'format' || key === 'f') {
       return value === alias
@@ -230,6 +231,15 @@ export function getBadgeColor(linkFormat: FileFormat): string {
   return 'var(--color-gray-700)' // Default color ?
 }
 
+export function getLinkId(link: DatasetOnlineResource): string {
+  const href = link.url.href ?? link.url
+  return `${getLinkLabel(link)
+    .replace(/é/g, 'e')
+    .replace(/è/g, 'e')
+    .normalize('NFD')
+    .replace(/[\u0300-\u036f]/g, '')}-${href}`
+}
+
 export function getLinkLabel(
   link: DatasetOnlineResource | ServiceOnlineResource
 ): string {

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

@@ -0,0 +1,2 @@
+export * from './quality-score.util'
+export * from './record.util'

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,6 +4,7 @@ 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'

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 })
+  )
+}