geonetwork-ui 2.4.0-dev.344a92f2 → 2.4.0-dev.3b6b95eb

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

@@ -6,6 +6,7 @@ import {
 import { ElasticsearchService } from './elasticsearch'
 import {
   combineLatest,
+  exhaustMap,
   from,
   Observable,
   of,
@@ -25,22 +26,30 @@ import {
 } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { catchError, map, tap } from 'rxjs/operators'
 import {
+  assertValidXml,
   findConverterForDocument,
   Gn4Converter,
   Gn4SearchResults,
   Iso19139Converter,
 } from '../../../../../../libs/api/metadata-converter/src'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { HttpErrorResponse } from '@angular/common/http'
+import {
+  HttpClient,
+  HttpErrorResponse,
+  HttpHeaders,
+} from '@angular/common/http'
 
 const TEMPORARY_ID_PREFIX = 'TEMP-ID-'
 
+export type RecordAsXml = string
+
 @Injectable()
 export class Gn4Repository implements RecordsRepositoryInterface {
   _draftsChanged = new Subject<void>()
   draftsChanged$ = this._draftsChanged.asObservable()
 
   constructor(
+    private httpClient: HttpClient,
     private gn4SearchApi: SearchApiService,
     private gn4SearchHelper: ElasticsearchService,
     private gn4Mapper: Gn4Converter,
@@ -140,6 +149,7 @@ export class Gn4Repository implements RecordsRepositoryInterface {
         )
       )
   }
+
   aggregate(params: AggregationsParams): Observable<Aggregations> {
     // if aggregations are empty, return an empty object right away
     if (Object.keys(params).length === 0) return of({})
@@ -184,44 +194,12 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
   }
 
-  /**
-   * Returns null if the record is not found
-   */
-  private loadRecordAsXml(uniqueIdentifier: string): Observable<string | null> {
-    return this.gn4RecordsApi
-      .getRecordAs(
-        uniqueIdentifier,
-        undefined,
-        false,
-        undefined,
-        undefined,
-        undefined,
-        'application/xml',
-        'response',
-        undefined,
-        { httpHeaderAccept: 'text/xml,application/xml' as 'application/xml' } // this is to make sure that the response is parsed as text
-      )
-      .pipe(
-        map((response) => response.body),
-        catchError((error: HttpErrorResponse) =>
-          error.status === 404 ? of(null) : throwError(() => error)
-        )
-      )
-  }
-
-  private getLocalStorageKeyForRecord(uniqueIdentifier: string) {
-    return `geonetwork-ui-draft-${uniqueIdentifier}`
-  }
-
   openRecordForEdition(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null> {
-    const draft$ = of(
-      window.localStorage.getItem(
-        this.getLocalStorageKeyForRecord(uniqueIdentifier)
-      )
-    )
-    const recordAsXml$ = this.loadRecordAsXml(uniqueIdentifier)
+    const draft$ = of(this.getRecordFromLocalStorage(uniqueIdentifier))
+    const recordAsXml$ = this.getRecordAsXml(uniqueIdentifier)
+
     return combineLatest([draft$, recordAsXml$]).pipe(
       switchMap(([draft, recordAsXml]) => {
         const xml = draft ?? recordAsXml
@@ -239,34 +217,27 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   openRecordForDuplication(
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, false] | null> {
-    return this.loadRecordAsXml(uniqueIdentifier).pipe(
-      switchMap(async (recordAsXml) => {
-        const converter = findConverterForDocument(recordAsXml)
-        const record = await converter.readRecord(recordAsXml)
+    return this.getRecordAsXml(uniqueIdentifier).pipe(
+      switchMap(async (fetchedRecordAsXml) => {
+        const converter = findConverterForDocument(fetchedRecordAsXml)
+        const record = await converter.readRecord(fetchedRecordAsXml)
+
         record.uniqueIdentifier = `${TEMPORARY_ID_PREFIX}${Date.now()}`
         record.title = `${record.title} (Copy)`
-        const xml = await converter.writeRecord(record, recordAsXml)
-        window.localStorage.setItem(
-          this.getLocalStorageKeyForRecord(record.uniqueIdentifier),
-          xml
+
+        const recordAsXml = await converter.writeRecord(
+          record,
+          fetchedRecordAsXml
         )
+
+        this.saveRecordToLocalStorage(recordAsXml, record.uniqueIdentifier)
         this._draftsChanged.next()
-        return [record, xml, false] as [CatalogRecord, string, false]
+
+        return [record, recordAsXml, false] as [CatalogRecord, string, false]
       })
     )
   }
 
-  private serializeRecordToXml(
-    record: CatalogRecord,
-    referenceRecordSource?: string
-  ): Observable<string> {
-    // if there's a reference record, use that standard; otherwise, use iso19139
-    const converter = referenceRecordSource
-      ? findConverterForDocument(referenceRecordSource)
-      : new Iso19139Converter()
-    return from(converter.writeRecord(record, referenceRecordSource))
-  }
-
   saveRecord(
     record: CatalogRecord,
     referenceRecordSource?: string
@@ -301,6 +272,32 @@ export class Gn4Repository implements RecordsRepositoryInterface {
     )
   }
 
+  duplicateExternalRecord(recordDownloadUrl: string): Observable<string> {
+    return this.getExternalRecordAsXml(recordDownloadUrl).pipe(
+      exhaustMap(async (fetchedRecordAsXml: string) => {
+        const converter = findConverterForDocument(fetchedRecordAsXml)
+        const record = await converter.readRecord(fetchedRecordAsXml)
+        const tempId = this.generateTemporaryId()
+
+        record.title = `${record.title} (Copy)`
+        record.uniqueIdentifier = tempId
+
+        const recordAsXml = await converter.writeRecord(
+          record,
+          fetchedRecordAsXml
+        )
+
+        this.saveRecordToLocalStorage(recordAsXml, record.uniqueIdentifier)
+        this._draftsChanged.next()
+
+        return tempId
+      }),
+      catchError((error: HttpErrorResponse) => {
+        return throwError(() => error)
+      })
+    )
+  }
+
   deleteRecord(uniqueIdentifier: string): Observable<void> {
     return this.gn4RecordsApi.deleteRecord(uniqueIdentifier)
   }
@@ -315,28 +312,19 @@ export class Gn4Repository implements RecordsRepositoryInterface {
   ): Observable<string> {
     return this.serializeRecordToXml(record, referenceRecordSource).pipe(
       tap((recordXml) => {
-        window.localStorage.setItem(
-          this.getLocalStorageKeyForRecord(record.uniqueIdentifier),
-          recordXml
-        )
+        this.saveRecordToLocalStorage(recordXml, record.uniqueIdentifier)
         this._draftsChanged.next()
       })
     )
   }
 
   clearRecordDraft(uniqueIdentifier: string): void {
-    window.localStorage.removeItem(
-      this.getLocalStorageKeyForRecord(uniqueIdentifier)
-    )
+    this.removeRecordFromLocalStorage(uniqueIdentifier)
     this._draftsChanged.next()
   }
 
   recordHasDraft(uniqueIdentifier: string): boolean {
-    return (
-      window.localStorage.getItem(
-        this.getLocalStorageKeyForRecord(uniqueIdentifier)
-      ) !== null
-    )
+    return this.getRecordFromLocalStorage(uniqueIdentifier) !== null
   }
 
   isRecordNotYetSaved(uniqueIdentifier: string): boolean {
@@ -356,4 +344,80 @@ export class Gn4Repository implements RecordsRepositoryInterface {
       )
     )
   }
+
+  private getRecordAsXml(uniqueIdentifier: string): Observable<string | null> {
+    return this.gn4RecordsApi
+      .getRecordAs(
+        uniqueIdentifier,
+        undefined,
+        false,
+        undefined,
+        undefined,
+        undefined,
+        'application/xml',
+        'response',
+        undefined,
+        { httpHeaderAccept: 'text/xml,application/xml' as 'application/xml' } // this is to make sure that the response is parsed as text
+      )
+      .pipe(
+        map((response) => response.body),
+        catchError((error: HttpErrorResponse) =>
+          error.status === 404 ? of(null) : throwError(() => error)
+        )
+      )
+  }
+
+  private serializeRecordToXml(
+    record: CatalogRecord,
+    referenceRecordSource?: string
+  ): Observable<string> {
+    // if there's a reference record, use that standard; otherwise, use iso19139
+    const converter = referenceRecordSource
+      ? findConverterForDocument(referenceRecordSource)
+      : new Iso19139Converter()
+    return from(converter.writeRecord(record, referenceRecordSource))
+  }
+
+  private getExternalRecordAsXml(
+    recordDownloadUrl: string
+  ): Observable<string> {
+    let headers = new HttpHeaders()
+    const responseType_ = 'text'
+    headers = headers.set('Accept', 'text/xml,application/xml')
+
+    return this.httpClient
+      .get<string>(recordDownloadUrl, {
+        responseType: <any>responseType_,
+        headers: headers,
+        observe: 'body',
+      })
+      .pipe(
+        map((recordAsXmlFile) => {
+          assertValidXml(recordAsXmlFile)
+
+          return recordAsXmlFile
+        })
+      )
+  }
+
+  private getLocalStorageKeyForRecord(recordId: string): string {
+    return `geonetwork-ui-draft-${recordId}` // Never change this prefix as it is a breaking change
+  }
+
+  private saveRecordToLocalStorage(recordAsXml: RecordAsXml, recordId: string) {
+    window.localStorage.setItem(
+      this.getLocalStorageKeyForRecord(recordId),
+      recordAsXml
+    )
+  }
+
+  private getRecordFromLocalStorage(recordId: string): RecordAsXml {
+    return window.localStorage.getItem(
+      this.getLocalStorageKeyForRecord(recordId)
+    )
+  }
+
+  private removeRecordFromLocalStorage(recordId: string): void {
+    window.localStorage.removeItem(this.getLocalStorageKeyForRecord(recordId))
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { combineLatest, Observable, of, switchMap } from 'rxjs'
+import { combineLatest, Observable, of, switchMap, throwError } from 'rxjs'
 import { catchError, filter, map, shareReplay, tap } from 'rxjs/operators'
 import {
   MeApiService,
@@ -10,7 +10,10 @@ import {
   UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
-import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import {
+  PlatformServiceInterface,
+  UploadEvent,
+} from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import {
   Keyword,
@@ -26,6 +29,7 @@ import {
   ThesaurusApiResponse,
 } from '../../../../../../../libs/api/metadata-converter/src'
 import { KeywordType } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { noDuplicateFileName } from '../../../../../../../libs/util/shared/src'
 
 const minApiVersion = '4.2.2'
 
@@ -288,34 +292,57 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
   }
 
-  attachFileToRecord(recordUuid: string, file: File) {
+  attachFileToRecord(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 const
-          }
-          if (event.type === HttpEventType.Response) {
-            return {
-              type: 'success',
-              attachment: {
-                url: new URL(event.body.url),
-                fileName: event.body.filename,
-              },
-              sizeBytes,
-            } as const
-          }
-          return undefined
-        }),
-        filter((event) => !!event)
-      )
+
+    // Check if the resource already exists on the server and rename it if that's the case
+    return this.getRecordAttachments(recordUuid).pipe(
+      map((recordAttachement) => recordAttachement.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
+          )
+          .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)
+        )
+      })
+    )
   }
 }

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

@@ -60,7 +60,7 @@ export interface Individual {
   email: string
   role: Role
   position?: string
-  organization: Organization
+  organization?: Organization
   address?: string
   phone?: string
 }

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

@@ -4,11 +4,11 @@ import type { Organization } from './model/record/organization.model'
 import { Keyword, UserFeedback } from './model/record'
 import { KeywordType } from './model/thesaurus'
 
-interface RecordAttachment {
+export interface RecordAttachment {
   url: URL
   fileName: string
 }
-type UploadEvent =
+export type UploadEvent =
   | {
       type: 'progress'
       progress: number // in percent

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

@@ -52,6 +52,16 @@ export abstract class RecordsRepositoryInterface {
     referenceRecordSource?: string
   ): Observable<string>
 
+  /**
+   * Try to duplicate the external record from given url. If it suceed, then it will save the record as draft and return its temporary id.
+   *
+   * @param recordDownloadUrl
+   * @returns Observable<string>
+   */
+  abstract duplicateExternalRecord(
+    recordDownloadUrl: string
+  ): Observable<string>
+
   /**
    * @param uniqueIdentifier
    * @returns Observable<void> Returns when record is deleted

package/src/libs/common/fixtures/src/index.ts

@@ -10,6 +10,9 @@ export * from './lib/record-link.fixtures'
 export * from './lib/records.fixtures'
 export * from './lib/repository.fixtures'
 export * from './lib/user.fixtures'
+export * from './lib/individual.fixtures'
 export * from './lib/user-feedbacks.fixtures'
 
 export * from './lib/editor'
+
+export * from './lib/map'

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

@@ -0,0 +1,61 @@
+import { Individual } from '../../../../../libs/common/domain/src/lib/model/record'
+import { barbieIncOrganizationFixture } from './organisations.fixture'
+
+export const createIndividualFixture = (
+  overrides: Partial<Individual> = {}
+): Individual => ({
+  firstName: 'Arnaud',
+  lastName: 'Demaison',
+  email: 'a.demaison@geo2france.fr',
+  organization: barbieIncOrganizationFixture(),
+  role: 'point_of_contact',
+  ...overrides,
+})
+
+export const barbieIndividualFixture = (): Individual =>
+  createIndividualFixture({
+    firstName: 'Barbara',
+    lastName: 'Roberts',
+    email: 'barbie@email.org',
+    organization: barbieIncOrganizationFixture(),
+    role: 'point_of_contact',
+  })
+
+export const someIndividualsFixture = (): Individual[] => [
+  barbieIndividualFixture(),
+  {
+    firstName: 'John',
+    lastName: 'Doe',
+    email: 'john.doe@email.com',
+    organization: barbieIncOrganizationFixture(),
+    role: 'owner',
+  },
+  {
+    firstName: 'Alice',
+    lastName: 'Smith',
+    email: 'alice.smith@workplace.com',
+    organization: barbieIncOrganizationFixture(),
+    role: 'author',
+  },
+  {
+    firstName: 'Michael',
+    lastName: 'Johnson',
+    email: 'michael.j@company.org',
+    organization: barbieIncOrganizationFixture(),
+    role: 'contributor',
+  },
+  {
+    firstName: 'Emma',
+    lastName: 'Williams',
+    email: 'emma.w@business.io',
+    organization: barbieIncOrganizationFixture(),
+    role: 'rights_holder',
+  },
+  {
+    firstName: 'David',
+    lastName: 'Brown',
+    email: 'david.brown@enterprise.net',
+    organization: barbieIncOrganizationFixture(),
+    role: 'stakeholder',
+  },
+]

package/src/libs/common/fixtures/src/lib/map/index.ts

@@ -0,0 +1 @@
+export * from './map-context.fixtures'

package/src/libs/common/fixtures/src/lib/map/map-context.fixtures.ts

@@ -0,0 +1,53 @@
+import { polygonFeatureCollectionFixture } from '../geojson.fixtures'
+import { Extent } from 'ol/extent'
+import type {
+  MapContext,
+  MapContextLayer,
+  MapContextView,
+} from '@geospatial-sdk/core'
+
+export const mapCtxLayerXyzFixture = (): MapContextLayer => ({
+  type: 'xyz',
+  url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+  attributions: '<a href="https://www.openstreetmap.org/copyright">',
+})
+
+export const mapCtxLayerWmsFixture = (): MapContextLayer => ({
+  type: 'wms',
+  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WMS',
+  name: 'commune_actuelle_3857',
+})
+
+export const mapCtxLayerWfsFixture = (): MapContextLayer => ({
+  type: 'wfs',
+  url: 'https://www.geograndest.fr/geoserver/region-grand-est/ows?REQUEST=GetCapabilities&SERVICE=WFS&VERSION=1.1.0',
+  featureType: 'ms:commune_actuelle_3857',
+})
+
+export const mapCtxLayerGeojsonFixture = (): MapContextLayer => ({
+  type: 'geojson',
+  data: polygonFeatureCollectionFixture(),
+})
+
+export const mapCtxLayerGeojsonRemoteFixture = (): MapContextLayer => ({
+  type: 'geojson',
+  url: 'https://my.host.com/data/regions.json',
+})
+
+export const mapCtxViewFixture = (): MapContextView => ({
+  center: [7.75, 48.6],
+  zoom: 9,
+})
+
+export const mapCtxFixture = (): MapContext => ({
+  layers: [
+    mapCtxLayerXyzFixture(),
+    mapCtxLayerWmsFixture(),
+    mapCtxLayerGeojsonFixture(),
+  ],
+  view: mapCtxViewFixture(),
+})
+
+export const mapCtxExtentFixture = (): Extent => [
+  171083.69713494915, 6246047.945419401, 476970.39956295764, 6631079.362882684,
+]

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

@@ -28,6 +28,19 @@ export const barbieUserFixture = (): UserModel =>
       'https://www.gravatar.com/avatar/dbdffd183622800bcf8587328daf43a6?d=mp',
   })
 
+export const johnDoeUserFixture = (): UserModel =>
+  createUserFixture({
+    id: '12345',
+    profile: 'User',
+    username: 'johndoe',
+    name: 'John',
+    surname: 'Doe',
+    email: 'johndoe@email.com',
+    organisation: 'Doe Enterprises',
+    profileIcon:
+      'https://www.gravatar.com/avatar/5f6d74eabcb57186a12f7c8ba40b4c9f?d=mp',
+  })
+
 export const ghostUserFixture = (): UserModel =>
   createUserFixture({
     id: '161',

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

@@ -1,6 +1,9 @@
 import { InjectionToken, NgModule } from '@angular/core'
 import { SiteTitleComponent } from './site-title/site-title.component'
-import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
+import {
+  OrganisationsFilterComponent,
+  UiCatalogModule,
+} from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
@@ -64,6 +67,7 @@ const organizationsServiceFactory = (
     UtilI18nModule,
     TranslateModule.forChild(),
     UiElementsModule,
+    OrganisationsFilterComponent,
   ],
   exports: [SiteTitleComponent, SourceLabelComponent, OrganisationsComponent],
   providers: [

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

@@ -1,7 +1,10 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { FeatureMapModule } from '../../../../../libs/feature/map/src'
-import { UiMapModule } from '../../../../../libs/ui/map/src'
+import {
+  FeatureDetailComponent,
+  MapContainerComponent,
+} from '../../../../../libs/ui/map/src'
 import { GeoTableViewComponent } from './geo-table-view/geo-table-view.component'
 import { FigureContainerComponent } from './figure/figure-container/figure-container.component'
 import {
@@ -19,7 +22,6 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
   imports: [
     CommonModule,
     FeatureMapModule,
-    UiMapModule,
     UiDatavizModule,
     TableComponent,
     UiWidgetsModule,
@@ -27,6 +29,8 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
     ChartComponent,
     UiInputsModule,
     PopupAlertComponent,
+    FeatureDetailComponent,
+    MapContainerComponent,
   ],
   declarations: [
     GeoTableViewComponent,

package/src/libs/feature/dataviz/src/lib/geo-table-view/geo-table-view.component.html

@@ -1,14 +1,17 @@
 <div class="flex flex-row h-full overflow-auto">
   <gn-ui-table
+    #table
     class="w-1/2 overflow-auto"
     [data]="tableData"
     [activeId]="selectionId"
     (selected)="onTableSelect($event)"
   ></gn-ui-table>
-  <gn-ui-map-context
+  <gn-ui-map-container
+    #mapContainer
     class="w-1/2 h-full"
     [context]="mapContext"
-  ></gn-ui-map-context>
+    (featuresClick)="onMapFeatureSelect($event)"
+  ></gn-ui-map-container>
   <gn-ui-feature-detail
     style="width: 300px"
     class="p-3 shrink-0 overflow-auto"