geonetwork-ui 2.6.0-dev.b1563a5e0 → 2.6.0-dev.bb0bdaec6

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)
             )
           )
       })
@@ -345,56 +349,64 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
   }
 
-  attachFileToRecord(recordUuid: string, file: File): Observable<UploadEvent> {
+  private uploadFile(recordUuid: string, file: File): Observable<UploadEvent> {
     let sizeBytes = -1
+    return this.recordsApiService
+      .putResource(recordUuid, file, 'public', undefined, 'events', true)
+      .pipe(
+        map((event) => {
+          if (event.type === HttpEventType.UploadProgress) {
+            sizeBytes = event.total
+            return {
+              type: 'progress',
+              progress: event.total
+                ? Math.round((100 * event.loaded) / event.total)
+                : 0,
+            } as UploadEvent
+          }
+          if (event.type === HttpEventType.Response) {
+            return {
+              type: 'success',
+              attachment: {
+                url: new URL(event.body.url),
+                fileName: event.body.filename,
+              },
+              sizeBytes,
+            } as UploadEvent
+          }
+          return undefined
+        }),
+        filter((event) => !!event),
+        catchError((error) => {
+          return throwError(
+            () => new Error(error.error?.message ?? error.message)
+          )
+        })
+      )
+  }
 
-    // Check if the resource already exists on the server and rename it if that's the case
+  attachFileToRecord(
+    recordUuid: string,
+    file: File,
+    removeDuplicate = false
+  ): Observable<UploadEvent> {
     return this.getRecordAttachments(recordUuid).pipe(
-      map((recordAttachement) => recordAttachement.map((r) => r.fileName)),
+      map((recordAttachments) => recordAttachments.map((r) => r.fileName)),
       switchMap((fileNames) => {
-        const fileName = noDuplicateFileName(file.name, fileNames)
-
-        const fileCopy = new File([file], fileName, { type: file.type })
-
-        return this.recordsApiService
-          .putResource(
-            recordUuid,
-            fileCopy,
-            'public',
-            undefined,
-            'events',
-            true
+        const fileName = file.name
+
+        if (removeDuplicate && fileNames.includes(file.name)) {
+          return this.recordsApiService.delResource(recordUuid, fileName).pipe(
+            switchMap(() => {
+              const fileCopy = new File([file], fileName, { type: file.type })
+              return this.uploadFile(recordUuid, fileCopy)
+            })
           )
-          .pipe(
-            map((event) => {
-              if (event.type === HttpEventType.UploadProgress) {
-                sizeBytes = event.total
-                return {
-                  type: 'progress',
-                  progress: event.total
-                    ? Math.round((100 * event.loaded) / event.total)
-                    : 0,
-                } as UploadEvent
-              }
-              if (event.type === HttpEventType.Response) {
-                return {
-                  type: 'success',
-                  attachment: {
-                    url: new URL(event.body.url),
-                    fileName: event.body.filename,
-                  },
-                  sizeBytes,
-                } as UploadEvent
-              }
-              return undefined
-            }),
-            filter((event) => !!event)
-          )
-      }),
-      catchError((error) => {
-        return throwError(
-          () => new Error(error.error?.message ?? error.message)
-        )
+        } else {
+          const finalFileName = noDuplicateFileName(fileName, fileNames)
+          const fileCopy = new File([file], finalFileName, { type: file.type })
+          return this.uploadFile(recordUuid, fileCopy)
+        }
       })
     )
   }

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/dataviz/dataviz-configuration.model.ts

@@ -1,3 +1,5 @@
+import { DatasetOnlineResource } from '../record'
+
 export type AggregationTypes = 'count' | 'sum' | 'min' | 'max' | 'average'
 
 export const CHART_TYPE_VALUES = [
@@ -11,9 +13,15 @@ export const CHART_TYPE_VALUES = [
 
 export type InputChartType = (typeof CHART_TYPE_VALUES)[number]
 
-export interface DatavizConfigurationModel {
+export interface DatavizChartConfigModel {
   xProperty: string
   yProperty: string
   aggregation: AggregationTypes
   chartType: InputChartType
 }
+
+export interface DatavizConfigModel {
+  view: string
+  source: DatasetOnlineResource
+  chartConfig?: DatavizChartConfigModel
+}

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

@@ -233,14 +233,6 @@ export interface DatasetRecord extends BaseRecord {
   spatialRepresentation?: SpatialRepresentationType
 }
 
-export type DatasetFeatureCatalog = {
-  featureTypes: Array<{
-    name: string
-    definition: string
-    attributes: Array<{ name: string; title: string; code: string }>
-  }>
-}
-
 export interface ServiceEndpoint {
   url: URL
   accessServiceProtocol: ServiceProtocol
@@ -268,18 +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
-    type: string
-    code: string
-  }>
+  attributeTable: Array<DatasetFeatureAttribute>
 }
 
 export type ReuseType = 'application' | 'map' | 'other'

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -52,6 +52,7 @@ export abstract class PlatformServiceInterface {
   abstract cleanRecordAttachments(recordUuid: CatalogRecord): Observable<void>
   abstract attachFileToRecord(
     recordUuid: string,
-    file: File
+    file: File,
+    removeDuplicate?: boolean
   ): Observable<UploadEvent>
 }

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>
@@ -22,7 +26,10 @@ export abstract class RecordsRepositoryInterface {
   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
@@ -97,4 +104,5 @@ export abstract class RecordsRepositoryInterface {
     localRecord: CatalogRecord
   ): Observable<{ user: string; date: Date }>
   abstract getRecordPublicationStatus(uuid: string): Observable<boolean>
+  abstract getApplicationLanguages(): Observable<LanguageCode[]>
 }

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -3,6 +3,7 @@ import {
   DatasetRecord,
   DatasetSpatialExtent,
   Keyword,
+  ServiceRecord,
 } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export const datasetRecordsFixture: () => CatalogRecord[] = () => [
@@ -176,6 +177,20 @@ As such, **it is not very interesting at all.**`,
               link: '',
               definition: 'Nom de la rue',
               type: 'String (48)',
+              values: [
+                {
+                  code: 'Pomme',
+                  label: 'Les Pommiers',
+                  description: 'Sous les pommiers',
+                },
+                {
+                  code: 'Cotton',
+                  label: 'Rue Cotton',
+                  description: 'Rue Cotton',
+                },
+                { code: "Passage de l'échiquier" },
+                { description: 'Rue du Charlieu' },
+              ],
             },
             {
               code: 'RUE',
@@ -811,6 +826,52 @@ export const importDatasetRecordAsXmlFixture = (): string => `
 	</gmd:identificationInfo>
 </gmd:MD_Metadata>`
 
+export const simpleServiceRecordFixture = (): ServiceRecord => ({
+  abstract: `Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".`,
+  kind: 'service',
+  recordUpdated: new Date('2023-03-17T07:38:08.875Z'),
+  recordPublished: null,
+  ownerOrganization: null,
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  contacts: [],
+  contactsForResource: [],
+  keywords: [],
+  topics: [],
+  spatialExtents: [],
+  overviews: [],
+  defaultLanguage: null,
+  otherLanguages: [],
+  title: 'Sites de gestion des déchets miniers - Service de visualisation WMS',
+  onlineResources: [
+    {
+      name: 'Rapport de disponibilité du service WMS',
+      description:
+        'Ce service de visualisation WMS permet de consulter la série de couches de données "Sites de gestion des déchets miniers - Série".',
+      mimeType: 'text/html',
+      type: 'link',
+      url: new URL(
+        'https://geoservices.wallonie.be/rapportDisponibilite/wms/sites_de_gestion_des_dechets_miniers_srie.html'
+      ),
+      accessRestricted: false,
+    },
+  ],
+  uniqueIdentifier: '00b22798-ec8e-4500-89e8-90eeeda45919',
+  landingPage: new URL(
+    'http://localhost:4200/geonetwork/srv/fre/catalog.search#/metadata/00b22798-ec8e-4500-89e8-90eeeda45919'
+  ),
+  extras: {
+    isPublishedToAll: true,
+    id: '723',
+    isHarvested: true,
+    ownerInfo: 'admin|admin|admin|Administrator',
+    edit: true,
+  },
+  recordCreated: new Date('2023-03-17T07:38:08.875Z'),
+})
+
 export const NATIONAL_KEYWORD = {
   key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/national',
   label: 'National',
@@ -909,3 +970,55 @@ export const SAMPLE_RECORD = {
     ...SAMPLE_PLACE_KEYWORDS_FROM_XML,
   ],
 }
+
+export const multilingualDatasetFixture: () => DatasetRecord = () => ({
+  kind: 'dataset',
+  defaultLanguage: 'en',
+  otherLanguages: ['fr', 'de'],
+  title: 'English Title',
+  abstract: 'English Abstract',
+  lineage: 'English Lineage',
+  translations: {
+    title: { fr: 'Titre Français', de: 'Titel DE' },
+    abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },
+    lineage: { fr: 'Généalogie Français', de: 'Lineage DE' },
+  },
+  keywords: [
+    {
+      label: 'Keyword EN',
+      description: 'Keyword Desc EN',
+      type: 'theme',
+      translations: {
+        label: { fr: 'Mot-clé FR', de: 'Schlusselwort DE' },
+        description: { fr: 'Description FR', de: 'Schlusselwort DE' },
+      },
+    },
+  ],
+  onlineResources: [],
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  contacts: [],
+  contactsForResource: [],
+  ownerOrganization: {
+    name: 'Org EN',
+    translations: {
+      name: { fr: 'Org FR', de: 'Org DE' },
+    },
+  },
+  spatialExtents: [
+    {
+      description: 'Extent EN',
+      translations: {
+        description: { fr: 'Étendue FR', de: 'Bereich DE' },
+      },
+    },
+  ],
+  temporalExtents: [],
+  status: 'ongoing',
+  uniqueIdentifier: 'ABCD-EFGH',
+  overviews: [],
+  topics: [],
+  recordUpdated: null,
+})

package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts

@@ -10,10 +10,7 @@ import {
 } from '../../../../../libs/data-access/gn4/src'
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'
-import { LangService, UtilI18nModule } from '../../../../../libs/util/i18n/src'
-import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
-import { UiElementsModule } from '../../../../../libs/ui/elements/src'
+import { TranslateService } from '@ngx-translate/core'
 import { OrganizationsServiceInterface } from '../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import {
   ElasticsearchService,
@@ -35,8 +32,7 @@ const organizationsServiceFactory = (
   searchApiService: SearchApiService,
   groupsApiService: GroupsApiService,
   translateService: TranslateService,
-  platformService: PlatformServiceInterface,
-  langService: LangService
+  platformService: PlatformServiceInterface
 ) =>
   strategy === 'groups'
     ? new OrganizationsFromGroupsService(
@@ -50,20 +46,12 @@ const organizationsServiceFactory = (
         searchApiService,
         groupsApiService,
         platformService,
-        langService
+        translateService
       )
 
 @NgModule({
   declarations: [SiteTitleComponent, SourceLabelComponent],
-  imports: [
-    UiLayoutModule,
-    CommonModule,
-    UtilI18nModule,
-    TranslateModule.forChild(),
-    UiElementsModule,
-    OrganisationsFilterComponent,
-    CatalogTitleComponent,
-  ],
+  imports: [CommonModule, OrganisationsFilterComponent, CatalogTitleComponent],
   exports: [SiteTitleComponent, SourceLabelComponent],
   providers: [
     {
@@ -76,7 +64,6 @@ const organizationsServiceFactory = (
         GroupsApiService,
         TranslateService,
         PlatformServiceInterface,
-        LangService,
       ],
     },
   ],

package/src/libs/feature/catalog/src/lib/sources/sources.service.ts

@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core'
 import { SourcesApiService } from '../../../../../../libs/data-access/gn4/src'
-import { LangService } from '../../../../../../libs/util/i18n/src'
 import { Observable } from 'rxjs'
 import { filter, map, shareReplay } from 'rxjs/operators'
 import { CatalogSource } from './sources.model'
+import { TranslateService } from '@ngx-translate/core'
+import { getLang3FromLang2 } from '../../../../../../libs/util/i18n/src'
 
 @Injectable({
   providedIn: 'root',
@@ -15,14 +16,17 @@ export class SourcesService {
 
   constructor(
     private sourcesApiService: SourcesApiService,
-    private langService: LangService
+    private translateService: TranslateService
   ) {}
 
   getSourceLabel(uuid: string): Observable<string> {
     return this.sources$.pipe(
       map((sources) => sources.filter((source) => source.uuid === uuid)[0]),
       filter((source) => !!source),
-      map((source) => source.label[this.langService.iso3])
+      map(
+        (source) =>
+          source.label[getLang3FromLang2(this.translateService.currentLang)]
+      )
     )
   }
 }

package/src/libs/feature/dataviz/src/lib/chart-view/chart-view.component.ts

@@ -33,7 +33,7 @@ import {
   DatasetFeatureCatalog,
   DatasetOnlineResource,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { TranslatePipe, TranslateService } from '@ngx-translate/core'
 import { CommonModule } from '@angular/common'
 import { ChartComponent } from '../../../../../../libs/ui/dataviz/src'
 import {
@@ -61,10 +61,10 @@ marker('chart.aggregation.count')
   imports: [
     CommonModule,
     DropdownSelectorComponent,
-    TranslateModule,
     ChartComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
+    TranslatePipe,
   ],
   standalone: true,
 })

package/src/libs/feature/dataviz/src/lib/figure/figure-container/figure-container.component.ts

@@ -4,7 +4,7 @@ import {
   Input,
   OnChanges,
 } from '@angular/core'
-import { TableItemModel, UiDatavizModule } from '../../../../../../../libs/ui/dataviz/src'
+import { FigureComponent, TableItemModel } from '../../../../../../../libs/ui/dataviz/src'
 import { FigureService } from '../figure.service'
 
 @Component({
@@ -13,7 +13,7 @@ import { FigureService } from '../figure.service'
   styleUrls: ['./figure-container.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [UiDatavizModule],
+  imports: [FigureComponent],
 })
 export class FigureContainerComponent implements OnChanges {
   @Input() dataset: TableItemModel[]