geonetwork-ui 2.6.0-dev.7be6567ef → 2.6.0-dev.86c0fa7b5

package/src/libs/api/metadata-converter/src/lib/fixtures/wallonie.records.service+napitswallonia.ts

@@ -274,10 +274,10 @@ export const WALLONIE_SERVICE_NAPITSWALLONIA_RECORD: ServiceRecord = {
   onlineResources: [
     {
       type: 'endpoint',
-      endpointUrl: new URL(
+      url: new URL(
         'https://metawal.wallonie.be/geonetwork/api/collections/napits'
       ),
-      protocol: 'other',
+      accessServiceProtocol: 'other',
       description: "Point d'accès OGC API Records pour NAP-ITS-Wallonia.",
       translations: {},
     },

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -152,12 +152,22 @@ export class Gn4FieldMapper {
       )
       const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
       const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null // set the first language as main one as fallback
+
+      return {
+        ...output,
+        defaultLanguage,
+      }
+    },
+    otherLanguage: (output, source) => {
+      const langList = getAsArray(selectField<string>(source, 'otherLanguage'))
+      const languages = langList.map((lang) => LANG_3_TO_2_MAPPER[lang])
+      const defaultLanguage = output.defaultLanguage ?? languages[0] ?? null
       const otherLanguages = languages.filter(
         (lang) => lang !== defaultLanguage
       )
+
       return {
         ...output,
-        defaultLanguage,
         otherLanguages,
       }
     },
@@ -294,12 +304,52 @@ export class Gn4FieldMapper {
         ) ?? {},
         '_source'
       )
-      const featureCatalogIdentifier = selectField(
+      const featureCatalogIdentifier: string = selectField(
         <SourceWithUnknownProps>fcatSource,
         'uuid'
       )
-      return featureCatalogIdentifier
-        ? this.addExtra({ featureCatalogIdentifier }, output)
+      const sourceOfLinks = getAsArray(
+        selectField(
+          <SourceWithUnknownProps>selectField(source, 'related'),
+          'hassources'
+        )
+      )
+      const sourceOfIdentifiers: string[] = sourceOfLinks
+        .filter((link) => link['origin'] === 'catalog')
+        .map((link) => {
+          return selectField(
+            selectField(<SourceWithUnknownProps>link, '_source'),
+            'uuid'
+          )
+        })
+      const extraValues: Record<string, string | string[]> = {}
+      if (featureCatalogIdentifier) {
+        extraValues.featureCatalogIdentifier = featureCatalogIdentifier
+      }
+      if (sourceOfIdentifiers && sourceOfIdentifiers.length > 0) {
+        extraValues.sourceOfIdentifiers = sourceOfIdentifiers
+      }
+      return Object.keys(extraValues).length > 0
+        ? this.addExtra(extraValues, output)
+        : output
+    },
+    recordLink: (output, source) => {
+      const recordLinks = getAsArray(
+        selectField<SourceWithUnknownProps[]>(source, 'recordLink')
+      )
+      const sourcesIdentifiers: string[] = recordLinks
+        .filter(
+          (link) => link['origin'] === 'catalog' && link['type'] === 'sources'
+        )
+        .map((link) => selectField(<SourceWithUnknownProps>link, 'to'))
+
+      return sourcesIdentifiers && sourcesIdentifiers.length > 0
+        ? this.addExtra(
+            {
+              sourcesIdentifiers,
+            },
+            output
+          )
         : output
     },
     isPublishedToAll: (output, source) =>
@@ -309,6 +359,13 @@ export class Gn4FieldMapper {
         },
         output
       ),
+    isHarvested: (output, source) =>
+      this.addExtra(
+        {
+          isHarvested: selectField(source, 'isHarvested') !== 'false',
+        },
+        output
+      ),
     edit: (output, source) =>
       this.addExtra(
         {
@@ -430,6 +487,7 @@ export class Gn4FieldMapper {
       /^OGC:WMS/.test(protocol) ||
       /^OGC:WFS/.test(protocol) ||
       /^OGC:WMTS/.test(protocol) ||
+      /TMS/i.test(protocol) ||
       /ogc\W*api\W*features/i.test(protocol) ||
       (/^WWW:DOWNLOAD-/.test(protocol) && /data.geopf.fr/.test(url)) // TO DO : change with the good protocol when decided
     ) {
@@ -460,6 +518,11 @@ export class Gn4FieldMapper {
       ),
       selectField<string>(sourceLink, 'description')
     )
+    const descriptionLink = selectField<object>(sourceLink, 'descriptionObject')
+    const accessRestricted =
+      descriptionLink &&
+      'link' in descriptionLink &&
+      descriptionLink.link.toString().includes('#MD_RestrictionCode_restricted')
     // no url: fail early
     if (url === null) {
       // TODO: collect errors at the record level?
@@ -485,6 +548,7 @@ export class Gn4FieldMapper {
           type,
           url: url,
           accessServiceProtocol,
+          accessRestricted: accessRestricted,
         }
       case 'link':
         return {
@@ -503,8 +567,8 @@ export class Gn4FieldMapper {
         return {
           ...distribution,
           type,
-          endpointUrl: url,
-          protocol: accessServiceProtocol,
+          url: url,
+          accessServiceProtocol: accessServiceProtocol,
         }
     }
   }

package/src/libs/api/metadata-converter/src/lib/gn4/types/metadata.model.ts

@@ -164,7 +164,6 @@ export type MetadataObject = Partial<{
   resourceDate: ResourceDate[]
   resourceEdition: string
   resourceIdentifier: ResourceIdentifier[]
-  resourceLanguage: string[]
   resourceTemporalDateRange: ResourceTemporalDateRange[]
   resourceTemporalExtentDateRange: ResourceTemporalDateRange[]
   resourceTitleObject: MultilingualField

package/src/libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts

@@ -363,11 +363,18 @@ export function readOnlineResources(rootEl: XmlElement): OnlineResource[] {
   )(rootEl)
 }
 
-function readLocaleElement(): ChainableFunction<XmlElement, LanguageCode> {
+export function readLocaleElement(): ChainableFunction<
+  XmlElement,
+  LanguageCode
+> {
   return pipe(
     findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
-    map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
+    map((lang) => {
+      const normalized = lang?.toLowerCase()
+      const iso2Lang = LANG_3_TO_2_MAPPER[normalized]
+      return iso2Lang ?? lang
+    })
   )
 }
 
@@ -381,6 +388,9 @@ export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
 export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
   return pipe(
     findChildrenElement('mdb:otherLocale', false),
-    mapArray(readLocaleElement())
+    mapArray(readLocaleElement()),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    )
   )(rootEl)
 }

package/src/libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts

@@ -529,7 +529,11 @@ export function writeOnlineResources(
 }
 
 function writeLocaleElement(language: LanguageCode) {
-  const lang3 = LANG_2_TO_3_MAPPER[language.toLowerCase()]
+  const normalizedLang = language.toLowerCase()
+  const lang3 =
+    normalizedLang.length === 2
+      ? LANG_2_TO_3_MAPPER[normalizedLang]
+      : normalizedLang
   return pipe(
     findChildOrCreate('lan:PT_Locale'),
     writeAttribute('id', language.toUpperCase()),

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -65,7 +65,8 @@ export function extractCharacterString(): ChainableFunction<
   return pipe(
     fallback(
       findChildElement('gco:CharacterString', false),
-      findChildElement('gmx:Anchor', false)
+      findChildElement('gmx:Anchor', false),
+      findChildElement('gmx:MimeFileType', false)
     ),
     readText()
   )
@@ -965,8 +966,8 @@ export function extractServiceOnlineResources(): ChainableFunction<
         } else {
           return {
             type: 'endpoint',
-            endpointUrl: url,
-            protocol,
+            url: url,
+            accessServiceProtocol: protocol,
             ...(description && { description }),
             translations,
           }
@@ -1161,11 +1162,14 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     findChildrenElement('gmd:locale', false),
     mapArray(
       pipe(
-        findChildElement('gmd:LanguageCode'),
+        findChildElement('lan:LanguageCode'),
         readAttribute('codeListValue'),
-        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()])
+        map((lang) => LANG_3_TO_2_MAPPER[lang.toLowerCase()] ?? lang)
       )
     ),
+    map((languages) =>
+      languages.filter((lang): lang is LanguageCode => lang !== null)
+    ),
     map((languages) => (languages.length ? languages : [defaultLanguage]))
   )(rootEl)
 }
@@ -1173,7 +1177,7 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
 export function readDefaultLanguage(rootEl: XmlElement): LanguageCode {
   return pipe(
     findChildElement('gmd:language', false),
-    findChildElement('gmd:LanguageCode'),
+    findChildElement('lan:LanguageCode'),
     readAttribute('codeListValue'),
     map((lang) => (lang ? LANG_3_TO_2_MAPPER[lang.toLowerCase()] : null))
   )(rootEl)

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -1227,7 +1227,7 @@ export function writeLineage(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
-  switch (endpoint.protocol.toLowerCase()) {
+  switch (endpoint.accessServiceProtocol.toLowerCase()) {
     case 'wfs':
       return 'OGC:WFS'
     case 'wms':
@@ -1235,14 +1235,14 @@ export function getServiceEndpointProtocol(endpoint: ServiceEndpoint): string {
     case 'wps':
       return 'OGC:WPS'
     default:
-      return endpoint.protocol
+      return endpoint.accessServiceProtocol
   }
 }
 
 export function createOnlineResource(onlineResource: ServiceOnlineResource) {
   let linkageUrl, functionCode, protocol
   if (onlineResource.type === 'endpoint') {
-    linkageUrl = onlineResource.endpointUrl.toString()
+    linkageUrl = onlineResource.url.toString()
     protocol = getServiceEndpointProtocol(onlineResource)
     functionCode = 'download'
   } else {
@@ -1471,7 +1471,10 @@ export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
       writeAttribute('id', lang.toUpperCase()),
       createNestedChild('gmd:languageCode', 'gmd:LanguageCode'),
       writeAttribute('codeList', 'http://www.loc.gov/standards/iso639-2/'),
-      writeAttribute('codeListValue', LANG_2_TO_3_MAPPER[lang])
+      writeAttribute(
+        'codeListValue',
+        lang.length === 2 ? LANG_2_TO_3_MAPPER[lang] : lang
+      )
     )
 
   // add new languages (only if other than default one)

package/src/libs/api/repository/src/lib/gn4/elasticsearch/constant.ts

@@ -8,6 +8,7 @@ export const ES_SOURCE_SUMMARY = [
   'overview',
   'logo',
   'codelist_status_text',
+  'link',
   'linkProtocol',
   'contactForResource.organisation',
   'contact.organisation',
@@ -17,8 +18,10 @@ export const ES_SOURCE_SUMMARY = [
   'cl_topic',
   'cl_maintenanceAndUpdateFrequency',
   'tag',
-  'MD_LegalConstraintsUseLimitationObject',
+  'MD_LegalConstraints*Object',
   'qualityScore',
+  'allKeywords',
+  'recordLink',
 ]
 
 export type EsQueryFieldsPriorityType = Record<string, number>

package/src/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts

@@ -124,11 +124,11 @@ export class ElasticsearchService {
     this.runtimeFields[fieldName] = expression
   }
 
-  getMetadataByIdPayload(uuid: string): EsSearchParams {
+  getMetadataByIdsPayload(uuids: string[]): EsSearchParams {
     return {
       query: {
         ids: {
-          values: [uuid],
+          values: uuids,
         },
       },
     }
@@ -137,7 +137,7 @@ export class ElasticsearchService {
   getRelatedRecordPayload(
     record: CatalogRecord,
     size = 6,
-    _source = [...ES_SOURCE_SUMMARY, 'allKeywords', 'createDate']
+    _source = [...ES_SOURCE_SUMMARY, 'createDate']
   ): EsSearchParams {
     return {
       query: {
@@ -299,14 +299,6 @@ export class ElasticsearchService {
 
   private mustNotFilters(): Record<string, unknown>[] {
     return [
-      {
-        ...this.queryFilterOnValues('resourceType', [
-          'service',
-          'map',
-          'map/static',
-          'mapDigital',
-        ]),
-      },
       {
         query_string: {
           query:
@@ -429,7 +421,7 @@ export class ElasticsearchService {
           must_not: this.mustNotFilters(),
         },
       },
-      _source: ['resourceTitleObject', 'uuid'],
+      _source: ['resourceTitleObject', 'uuid', 'resourceType'],
       from: 0,
       size: 20,
     }

package/src/libs/api/repository/src/lib/gn4/gn4-repository.ts

@@ -14,8 +14,8 @@ import {
 import { PublicationVersionError } from '../../../../../../libs/common/domain/src/lib/model/error'
 import {
   CatalogRecord,
-  DatasetFeatureType,
   DatasetFeatureCatalog,
+  DatasetFeatureType,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   Aggregations,
@@ -29,10 +29,11 @@ import {
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import {
+  LanguagesApiService,
   RecordsApiService,
   SearchApiService,
-  FeatureResponseApiModel,
 } from '../../../../../../libs/data-access/gn4/src'
+import { LANG_3_TO_2_MAPPER } from '../../../../../../libs/util/i18n/src'
 import {
   combineLatest,
   exhaustMap,
@@ -47,6 +48,7 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
+import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
 
@@ -65,7 +67,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     private gn4SearchHelper: ElasticsearchService,
     private gn4Mapper: Gn4Converter,
     private gn4RecordsApi: RecordsApiService,
-    private platformService: PlatformServiceInterface
+    private platformService: PlatformServiceInterface,
+    private gn4LanguagesApi: LanguagesApiService,
+    private settingsService: Gn4SettingsService
   ) {}
 
   search({
@@ -129,9 +133,9 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     return this.gn4SearchApi
       .search(
         'bucket',
-        ['fcats'],
+        ['fcats', 'hassources'],
         JSON.stringify(
-          this.gn4SearchHelper.getMetadataByIdPayload(uniqueIdentifier)
+          this.gn4SearchHelper.getMetadataByIdsPayload([uniqueIdentifier])
         )
       )
       .pipe(
@@ -142,6 +146,27 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  getMultipleRecords(
+    uniqueIdentifiers: string[]
+  ): Observable<CatalogRecord[] | null> {
+    return this.gn4SearchApi
+      .search(
+        'bucket',
+        undefined,
+        JSON.stringify(
+          this.gn4SearchHelper.getMetadataByIdsPayload(uniqueIdentifiers)
+        )
+      )
+      .pipe(
+        map((results: Gn4SearchResults) => results.hits.hits),
+        switchMap((records) =>
+          records && records.length > 0
+            ? this.gn4Mapper.readRecords(records)
+            : of(null)
+        )
+      )
+  }
+
   private mapEmbeddedFeatureCatalog(
     featureTypes: Array<DatasetFeatureType>
   ): DatasetFeatureCatalog {
@@ -150,10 +175,21 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         name: featureType.typeName || '',
         definition: featureType.definition || '',
         attributes: Array.isArray(featureType.attributeTable)
-          ? featureType.attributeTable.map((attr) => ({
-              name: attr.name,
-              title: attr.definition,
-            }))
+          ? featureType.attributeTable.map((attr) => {
+              const values = attr.values
+                ?.filter((v) => v.code || v.label)
+                .map((v) => ({
+                  code: v.code,
+                  label: v.label,
+                }))
+              return {
+                name: attr.name,
+                code: attr.code,
+                definition: attr.definition,
+                type: attr.type,
+                ...(values?.length > 0 ? { values } : {}),
+              }
+            })
           : [],
       })),
     }
@@ -164,7 +200,8 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   ): Observable<DatasetFeatureCatalog | null> {
     if (
       record.extras?.['featureTypes'] &&
-      Array.isArray(record.extras['featureTypes'])
+      Array.isArray(record.extras['featureTypes']) &&
+      record.extras['featureTypes'].length > 0
     ) {
       return of(this.mapEmbeddedFeatureCatalog(record.extras['featureTypes']))
     }
@@ -200,6 +237,24 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
+  getSources(record: CatalogRecord): Observable<CatalogRecord[]> {
+    const sourcesIdentifiers = record.extras?.['sourcesIdentifiers'] as string[]
+    if (sourcesIdentifiers && sourcesIdentifiers.length > 0) {
+      return this.getMultipleRecords(sourcesIdentifiers)
+    }
+    return of(null)
+  }
+
+  getSourceOf(record: CatalogRecord): Observable<CatalogRecord[]> {
+    const sourceOfIdentifiers = record.extras?.[
+      'sourceOfIdentifiers'
+    ] as string[]
+    if (sourceOfIdentifiers && sourceOfIdentifiers.length > 0) {
+      return this.getMultipleRecords(sourceOfIdentifiers)
+    }
+    return of(null)
+  }
+
   aggregate(params: AggregationsParams): Observable<Aggregations> {
     // if aggregations are empty, return an empty object right away
     if (Object.keys(params).length === 0) return of({})
@@ -252,14 +307,46 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       : of(true)
   }
 
-  canEditRecord(uniqueIdentifier: string): Observable<boolean> {
-    return this.getRecord(uniqueIdentifier).pipe(
-      map((record) => {
-        return record.extras['edit'] as boolean
+  canDuplicate(record: CatalogRecord): boolean {
+    return record.kind === 'dataset'
+  }
+
+  canDelete(record: CatalogRecord): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$.pipe(
+      map((allowEditHarvested) => {
+        return (
+          record.extras['edit'] &&
+          (!record.extras['isHarvested'] || allowEditHarvested)
+        )
       })
     )
   }
 
+  private canEdit(record: CatalogRecord, allowEditHarvested: boolean): boolean {
+    return (
+      record.kind === 'dataset' &&
+      record.extras['edit'] &&
+      (!record.extras['isHarvested'] || allowEditHarvested)
+    )
+  }
+
+  canEditRecord(uniqueIdentifier: string): Observable<boolean> {
+    return combineLatest([
+      this.getRecord(uniqueIdentifier),
+      this.settingsService.allowEditHarvested$,
+    ]).pipe(
+      map(([record, allowEditHarvested]) =>
+        record ? this.canEdit(record, allowEditHarvested) : false
+      )
+    )
+  }
+
+  canEditIndexedRecord(record: CatalogRecord): Observable<boolean> {
+    return this.settingsService.allowEditHarvested$.pipe(
+      map((allowEditHarvested) => this.canEdit(record, allowEditHarvested))
+    )
+  }
+
   openRecordForEdition(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null> {
@@ -362,9 +449,12 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         const record = await converter.readRecord(fetchedRecordAsXml)
 
         record.title = `${record.title} (Copy)`
-        await converter.writeRecord(record, fetchedRecordAsXml)
+        const recordAsXml = await converter.writeRecord(
+          record,
+          fetchedRecordAsXml
+        )
 
-        return this.saveRecord(record, '', false)
+        return this.saveRecord(record, recordAsXml, false)
       }),
       exhaustMap((uuidObservable: Observable<string>) => uuidObservable),
       catchError((error: HttpErrorResponse) => {
@@ -465,6 +555,18 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  getApplicationLanguages(): Observable<string[]> {
+    return this.gn4LanguagesApi
+      .getApplicationLanguages()
+      .pipe(
+        map((languages) =>
+          languages
+            .map((lang) => LANG_3_TO_2_MAPPER[lang.id ?? ''])
+            .filter((code): code is string => !!code)
+        )
+      )
+  }
+
   private getRecordAsXml(uniqueIdentifier: string): Observable<string | null> {
     return this.gn4RecordsApi
       .getRecordAs(

package/src/libs/api/repository/src/lib/gn4/gn4.provider.ts

@@ -2,6 +2,8 @@ import { Provider } from '@angular/core'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { Gn4PlatformService } from './platform/gn4-platform.service'
 import { Gn4PlatformMapper } from './platform/gn4-platform.mapper'
+import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Gn4Repository } from './gn4-repository'
 
 export function provideGn4(): Provider[] {
   return [
@@ -9,6 +11,10 @@ export function provideGn4(): Provider[] {
       provide: PlatformServiceInterface,
       useClass: Gn4PlatformService,
     },
+    {
+      provide: RecordsRepositoryInterface,
+      useClass: Gn4Repository,
+    },
     Gn4PlatformMapper,
   ]
 }

package/src/libs/api/repository/src/lib/gn4/platform/gn4-platform.service.ts

@@ -82,6 +82,13 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     shareReplay(1)
   )
 
+  private readonly allowEditHarvestedMd$ = this.settings$.pipe(
+    map((info) => {
+      return info['system/harvester/enableEditing'] as boolean
+    }),
+    shareReplay(1)
+  )
+
   /**
    * A map of already loaded thesauri (groups of keywords); the key is a URI
    * @private
@@ -123,6 +130,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.apiVersion$
   }
 
+  getAllowEditHarvestedMd(): Observable<boolean> {
+    return this.allowEditHarvestedMd$
+  }
+
   getMe(): Observable<UserModel> {
     return this.me$
   }

package/src/libs/api/repository/src/lib/gn4/settings/gn4-settings.service.ts

@@ -11,6 +11,9 @@ export class Gn4SettingsService {
     'system/users/identicon'
   )
 
+  public allowEditHarvested$: Observable<boolean> =
+    this.getSettingsSetValueByKey('system/harvester/enableEditing')
+
   constructor(private siteApiService: SiteApiService) {}
 
   private getSettingsSetValueByKey(key: string) {