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

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

@@ -14,8 +14,9 @@ import {
 import { PublicationVersionError } from '../../../../../../libs/common/domain/src/lib/model/error'
 import {
   CatalogRecord,
-  DatasetFeatureType,
   DatasetFeatureCatalog,
+  DatasetFeatureType,
+  LanguageCode,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
   Aggregations,
@@ -29,9 +30,9 @@ 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 {
   combineLatest,
@@ -47,6 +48,8 @@ import {
 import { catchError, map, tap } from 'rxjs/operators'
 import { lt } from 'semver'
 import { ElasticsearchService } from './elasticsearch'
+import { getLang2FromLang3 } from '../../../../../../libs/util/i18n/src'
+import { Gn4SettingsService } from './settings/gn4-settings.service'
 
 const minPublicationApiVersion = '4.2.5'
 
@@ -65,7 +68,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 +134,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 +147,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 +176,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 +201,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 +238,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 +308,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 +450,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 +556,18 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  getApplicationLanguages(): Observable<LanguageCode[]> {
+    return this.gn4LanguagesApi
+      .getApplicationLanguages()
+      .pipe(
+        map((languages) =>
+          languages
+            .map((lang) => getLang2FromLang3(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/organizations/organizations-from-groups.service.ts

@@ -7,7 +7,7 @@ import {
 import { forkJoin, Observable, of } from 'rxjs'
 import { map, shareReplay } from 'rxjs/operators'
 import { TranslateService } from '@ngx-translate/core'
-import { LANG_2_TO_3_MAPPER } from '../../../../../../../libs/util/i18n/src'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 import { FieldFilters } from '../../../../../../../libs/common/domain/src/lib/model/search'
 import {
   CatalogRecord,
@@ -51,6 +51,10 @@ export class OrganizationsFromGroupsService
   )
   organisationsCount$ = this.organisations$.pipe(map((orgs) => orgs.length))
 
+  private get lang3() {
+    return getLang3FromLang2(this.translateService.currentLang)
+  }
+
   constructor(
     private esService: ElasticsearchService,
     private searchApiService: SearchApiService,
@@ -72,9 +76,8 @@ export class OrganizationsFromGroupsService
   }
 
   private mapOrgFromGroup(group: GroupApiModel) {
-    const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
     return {
-      name: group.label[lang3],
+      name: group.label[this.lang3],
       ...(group.description && { description: group.description }),
       ...(group.email && { email: group.email }),
       ...(group.logo && {
@@ -89,9 +92,8 @@ export class OrganizationsFromGroupsService
   getFiltersForOrgs(orgs: Organization[]): Observable<FieldFilters> {
     return this.groups$.pipe(
       map((allGroups) => {
-        const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
         const groups = orgs.map((org) =>
-          allGroups.find((group) => group.label[lang3] === org.name)
+          allGroups.find((group) => group.label[this.lang3] === org.name)
         )
         return {
           groupOwner: groups.reduce(
@@ -108,10 +110,9 @@ export class OrganizationsFromGroupsService
     return forkJoin([this.groups$, this.organisations$]).pipe(
       map(([groups, orgs]) => {
         const groupIds = Object.keys(filters['groupOwner'])
-        const lang3 = LANG_2_TO_3_MAPPER[this.translateService.currentLang]
         return groupIds.map((id) => {
           const group = groups.find((group) => group.id.toString() === id)
-          return orgs.find((org) => org.name === group.label[lang3])
+          return orgs.find((org) => org.name === group.label[this.lang3])
         })
       })
     )

package/src/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.ts

@@ -33,9 +33,10 @@ import {
   tap,
   withLatestFrom,
 } from 'rxjs/operators'
-import { LangService } from '../../../../../../../libs/util/i18n/src'
+import { getLocalizedIndexKey } from '../../../../../../../libs/util/i18n/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { coerce, satisfies, valid } from 'semver'
+import { TranslateService } from '@ngx-translate/core'
 
 const IMAGE_URL = '/geonetwork/images/harvesting/'
 
@@ -121,10 +122,12 @@ export class OrganizationsFromMetadataService
     private searchApiService: SearchApiService,
     private groupsApiService: GroupsApiService,
     private platformService: PlatformServiceInterface,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
-  private lang3 = this.langService.gnLang
+  private get langIndex() {
+    return getLocalizedIndexKey(this.translateService.currentLang)
+  }
 
   equalsNormalizedStrings(
     str1: string,
@@ -287,19 +290,23 @@ export class OrganizationsFromMetadataService
   ): Observable<CatalogRecord> {
     const contacts: SourceWithUnknownProps[] = getAsArray(
       selectFallback(
-        selectTranslatedField(source, 'contactObject', this.lang3),
+        selectTranslatedField(source, 'contactObject', this.langIndex),
         selectField(source, 'contact')
       )
     )
     const resourceContacts: SourceWithUnknownProps[] = getAsArray(
       selectFallback(
-        selectTranslatedField(source, 'contactForResourceObject', this.lang3),
+        selectTranslatedField(
+          source,
+          'contactForResourceObject',
+          this.langIndex
+        ),
         selectField(source, 'contactForResource')
       )
     )
     const allContactOrgs = resourceContacts
       .concat(contacts)
-      .map((contact) => mapOrganization(contact, this.lang3))
+      .map((contact) => mapOrganization(contact, this.langIndex))
 
     if (!allContactOrgs.length) return of(record)
 

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

@@ -29,7 +29,6 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
-import { LangService } from '../../../../../../../libs/util/i18n/src'
 import { HttpClient, HttpEventType } from '@angular/common/http'
 import {
   KeywordApiResponse,
@@ -45,6 +44,8 @@ import {
   switchMap,
   throwError,
 } from 'rxjs'
+import { TranslateService } from '@ngx-translate/core'
+import { getLang3FromLang2 } from '../../../../../../../libs/util/i18n/src'
 
 const minApiVersion = '4.2.2'
 
@@ -82,12 +83,23 @@ 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
    */
   private keywordsByThesauri: Record<string, Observable<Keyword[]>> = {}
 
+  private get lang3() {
+    return getLang3FromLang2(this.translateService.currentLang)
+  }
+
   constructor(
     private siteApiService: SiteApiService,
     private meApi: MeApiService,
@@ -95,7 +107,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
-    private langService: LangService,
+    private translateService: TranslateService,
     private userfeedbackApiService: UserfeedbackApiService,
     private httpClient: HttpClient,
     private recordsApiService: RecordsApiService
@@ -123,6 +135,10 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.apiVersion$
   }
 
+  getAllowEditHarvestedMd(): Observable<boolean> {
+    return this.allowEditHarvestedMd$
+  }
+
   getMe(): Observable<UserModel> {
     return this.me$
   }
@@ -187,7 +203,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
 
         return this.registriesApiService.searchKeywords(
           query,
-          this.langService.iso3,
+          this.lang3,
           10,
           0,
           null,
@@ -200,11 +216,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
 
     return combineLatest([keywords$, this.allThesaurus$]).pipe(
       map(([keywords, thesaurus]) => {
-        return this.mapper.keywordsFromApi(
-          keywords,
-          thesaurus,
-          this.langService.iso3
-        )
+        return this.mapper.keywordsFromApi(keywords, thesaurus, this.lang3)
       })
     )
   }
@@ -215,7 +227,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     }
     const keywords$ = this.registriesApiService.searchKeywords(
       null,
-      this.langService.iso3,
+      this.lang3,
       1000,
       0,
       null,
@@ -229,11 +241,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       this.allThesaurus$,
     ]).pipe(
       map(([keywords, thesaurus]) => {
-        return this.mapper.keywordsFromApi(
-          keywords,
-          thesaurus,
-          this.langService.iso3
-        )
+        return this.mapper.keywordsFromApi(keywords, thesaurus, this.lang3)
       }),
       shareReplay(1)
     )
@@ -253,7 +261,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         return this.registriesApiService
           .searchKeywords(
             query,
-            this.langService.iso3,
+            this.lang3,
             100,
             0,
             null,
@@ -262,11 +270,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
           )
           .pipe(
             map((keywords: KeywordApiResponse[]) =>
-              this.mapper.keywordsFromApi(
-                keywords,
-                thesauri,
-                this.langService.iso3
-              )
+              this.mapper.keywordsFromApi(keywords, thesauri, this.lang3)
             )
           )
       })

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) {

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -152,6 +152,8 @@ export type ServiceProtocol =
   | 'esriRest'
   | 'ogcFeatures'
   | 'GPFDL'
+  | 'tms'
+  | 'maplibre-style'
   | 'other'
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
@@ -164,6 +166,7 @@ export interface DatasetServiceDistribution {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface DatasetDownloadDistribution {
@@ -178,6 +181,7 @@ export interface DatasetDownloadDistribution {
   description?: string
   accessServiceProtocol?: ServiceProtocol
   translations?: OnlineResourceTranslations
+  accessRestricted?: boolean
 }
 
 export interface OnlineLinkResource {
@@ -186,6 +190,8 @@ export interface OnlineLinkResource {
   name?: string
   description?: string
   translations?: OnlineResourceTranslations
+  mimeType?: string
+  accessRestricted?: boolean
 }
 
 export type DatasetOnlineResource = (
@@ -227,17 +233,9 @@ export interface DatasetRecord extends BaseRecord {
   spatialRepresentation?: SpatialRepresentationType
 }
 
-export type DatasetFeatureCatalog = {
-  featureTypes: Array<{
-    name: string
-    definition: string
-    attributes: Array<{ name: string; title: string }>
-  }>
-}
-
 export interface ServiceEndpoint {
-  endpointUrl: URL
-  protocol: string
+  url: URL
+  accessServiceProtocol: ServiceProtocol
   type: 'endpoint'
   description?: string
   translations?: OnlineResourceTranslations
@@ -262,13 +260,32 @@ export interface ReuseRecord extends BaseRecord {
   temporalExtents: Array<DatasetTemporalExtent>
 }
 
+export type DatasetFeatureCatalog = {
+  featureTypes: Array<{
+    name: string
+    definition: string
+    attributes: DatasetFeatureAttribute[]
+  }>
+}
+export interface DatasetFeatureAttributeValue {
+  code?: string
+  definition?: string
+  label?: string
+}
+export interface DatasetFeatureAttribute {
+  name: string
+  definition: string
+  type: string
+  code: string
+  values?: Array<DatasetFeatureAttributeValue>
+}
 export interface DatasetFeatureType {
   aliases: string
   code: string
   isAbstract: string
   typeName: string
   definition: string
-  attributeTable: Array<{ name: string; definition: string }>
+  attributeTable: Array<DatasetFeatureAttribute>
 }
 
 export type ReuseType = 'application' | 'map' | 'other'

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -6,7 +6,11 @@ import {
   SearchParams,
   SearchResults,
 } from '../model/search'
-import { CatalogRecord, DatasetFeatureCatalog } from '../model/record'
+import {
+  CatalogRecord,
+  DatasetFeatureCatalog,
+  LanguageCode,
+} from '../model/record'
 
 export abstract class RecordsRepositoryInterface {
   abstract search(params: SearchParams): Observable<SearchResults>
@@ -19,8 +23,13 @@ export abstract class RecordsRepositoryInterface {
   abstract getSimilarRecords(
     similarTo: CatalogRecord
   ): Observable<CatalogRecord[]>
+  abstract getSources(record: CatalogRecord): Observable<CatalogRecord[]>
+  abstract getSourceOf(record: CatalogRecord): Observable<CatalogRecord[]>
   abstract fuzzySearch(query: string): Observable<SearchResults>
+  abstract canDuplicate(record: CatalogRecord): boolean
+  abstract canDelete(record: CatalogRecord): Observable<boolean>
   abstract canEditRecord(uniqueIdentifier: string): Observable<boolean>
+  abstract canEditIndexedRecord(record: CatalogRecord): Observable<boolean>
   /**
    * This emits once:
    * - record object; if a draft exists, this will return it
@@ -95,4 +104,5 @@ export abstract class RecordsRepositoryInterface {
     localRecord: CatalogRecord
   ): Observable<{ user: string; date: Date }>
   abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
+  abstract getApplicationLanguages(): Observable<LanguageCode[]>
 }