geonetwork-ui 2.4.0-dev.78565730 → 2.4.0-dev.80a79eca

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

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core'
-import { Observable, combineLatest, of, switchMap } from 'rxjs'
-import { catchError, map, shareReplay, tap } from 'rxjs/operators'
+import { combineLatest, Observable, of, switchMap } from 'rxjs'
+import { catchError, filter, map, shareReplay, tap } from 'rxjs/operators'
 import {
   MeApiService,
+  RecordsApiService,
   RegistriesApiService,
   SiteApiService,
   ToolsApiService,
@@ -19,7 +20,7 @@ import {
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
-import { HttpClient } from '@angular/common/http'
+import { HttpClient, HttpEventType } from '@angular/common/http'
 import {
   KeywordApiResponse,
   ThesaurusApiResponse,
@@ -77,7 +78,8 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private registriesApiService: RegistriesApiService,
     private langService: LangService,
     private userfeedbackApiService: UserfeedbackApiService,
-    private httpClient: HttpClient
+    private httpClient: HttpClient,
+    private recordsApiService: RecordsApiService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
@@ -192,17 +194,16 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     if (this.keywordsByThesauri[uri]) {
       return this.keywordsByThesauri[uri]
     }
-    const keywords$: Observable<KeywordApiResponse[]> =
-      this.registriesApiService.searchKeywords(
-        null,
-        this.langService.iso3,
-        1000,
-        0,
-        null,
-        null,
-        null,
-        `${uri}*`
-      ) as Observable<KeywordApiResponse[]>
+    const keywords$ = this.registriesApiService.searchKeywords(
+      null,
+      this.langService.iso3,
+      1000,
+      0,
+      null,
+      null,
+      null,
+      `${uri}*`
+    ) as Observable<KeywordApiResponse[]>
 
     this.keywordsByThesauri[uri] = combineLatest([
       keywords$,
@@ -221,6 +222,38 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     return this.keywordsByThesauri[uri]
   }
 
+  searchKeywordsInThesaurus(query: string, thesaurusId: string) {
+    return this.allThesaurus$.pipe(
+      switchMap((thesauri) => {
+        const strippedThesaurusId = thesaurusId.replace(
+          'geonetwork.thesaurus.',
+          ''
+        )
+        if (!thesauri.find((thes) => thes.key === strippedThesaurusId))
+          return of([])
+        return this.registriesApiService
+          .searchKeywords(
+            query,
+            this.langService.iso3,
+            100,
+            0,
+            null,
+            [strippedThesaurusId],
+            null
+          )
+          .pipe(
+            map((keywords: KeywordApiResponse[]) =>
+              this.mapper.keywordsFromApi(
+                keywords,
+                thesauri,
+                this.langService.iso3
+              )
+            )
+          )
+      })
+    )
+  }
+
   getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
     return this.userfeedbackApiService.getUserComments(uuid).pipe(
       map((userFeedbacks) =>
@@ -243,4 +276,46 @@ export class Gn4PlatformService implements PlatformServiceInterface {
       })
     )
   }
+
+  getRecordAttachments(recordUuid: string) {
+    return this.recordsApiService.getAllResources(recordUuid).pipe(
+      map((resources) =>
+        resources.map((r) => ({
+          url: new URL(r.url),
+          fileName: r.filename,
+        }))
+      )
+    )
+  }
+
+  attachFileToRecord(recordUuid: string, file: File) {
+    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)
+      )
+  }
 }

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

@@ -1,4 +1,5 @@
 import { Organization } from './organization.model'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 
 export const RoleValues = [
   'unspecified',
@@ -24,6 +25,33 @@ export const RoleValues = [
   'user', // Party who uses the resource
 ]
 
+export const RoleLabels = new Map<Role, string>([
+  ['unspecified', marker('domain.contact.role.unspecified')],
+  ['other', marker('domain.contact.role.other')],
+  ['author', marker('domain.contact.role.author')],
+  ['collaborator', marker('domain.contact.role.collaborator')],
+  ['contributor', marker('domain.contact.role.contributor')],
+  ['custodian', marker('domain.contact.role.custodian')],
+  ['distributor', marker('domain.contact.role.distributor')],
+  ['editor', marker('domain.contact.role.editor')],
+  ['funder', marker('domain.contact.role.funder')],
+  ['mediator', marker('domain.contact.role.mediator')],
+  ['originator', marker('domain.contact.role.originator')],
+  ['owner', marker('domain.contact.role.owner')],
+  ['point_of_contact', marker('domain.contact.role.point_of_contact')],
+  [
+    'principal_investigator',
+    marker('domain.contact.role.principal_investigator'),
+  ],
+  ['processor', marker('domain.contact.role.processor')],
+  ['publisher', marker('domain.contact.role.publisher')],
+  ['resource_provider', marker('domain.contact.role.resource_provider')],
+  ['rights_holder', marker('domain.contact.role.rights_holder')],
+  ['sponsor', marker('domain.contact.role.sponsor')],
+  ['stakeholder', marker('domain.contact.role.stakeholder')],
+  ['user', marker('domain.contact.role.user')],
+])
+
 export type Role = typeof RoleValues[number]
 
 export interface Individual {

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

@@ -67,6 +67,7 @@ export interface Keyword {
   description?: string
   type: KeywordType
   thesaurus?: ThesaurusModel
+  bbox?: [number, number, number, number]
 }
 // languages should be expressed using two-letters ISO 639-1 codes
 export type LanguageCode = string
@@ -114,7 +115,7 @@ export type ServiceProtocol =
   | 'ogcFeatures'
   | 'other'
 
-export type DatasetDistributionType = 'service' | 'download' | 'link'
+export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
 
 export interface DatasetServiceDistribution {
   type: 'service'
@@ -145,12 +146,12 @@ export interface OnlineLinkResource {
   description?: string
 }
 
-export type DatasetDistribution = (
+export type DatasetOnlineResource = (
   | DatasetServiceDistribution
   | DatasetDownloadDistribution
   | OnlineLinkResource
 ) & {
-  type: DatasetDistributionType
+  type: OnlineResourceType
 }
 
 export interface GraphicOverview {
@@ -159,7 +160,8 @@ export interface GraphicOverview {
 }
 
 export interface DatasetSpatialExtent {
-  geometry: Geometry
+  bbox?: [number, number, number, number]
+  geometry?: Geometry
   description?: string
 }
 
@@ -176,14 +178,12 @@ export interface DatasetRecord extends BaseRecord {
   kind: 'dataset'
   status: RecordStatus
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
-  distributions: Array<DatasetDistribution>
+  onlineResources: Array<DatasetOnlineResource>
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
   spatialRepresentation?: SpatialRepresentationType
 }
 
-export type ServiceOnlineResourceType = 'endpoint' | 'link'
-
 export interface ServiceEndpoint {
   endpointUrl: URL
   protocol: string
@@ -192,7 +192,7 @@ export interface ServiceEndpoint {
 }
 
 export type ServiceOnlineResource = (ServiceEndpoint | OnlineLinkResource) & {
-  type: ServiceOnlineResourceType
+  type: OnlineResourceType
 }
 
 export interface ServiceRecord extends BaseRecord {
@@ -200,6 +200,8 @@ export interface ServiceRecord extends BaseRecord {
   onlineResources: Array<ServiceOnlineResource>
 }
 
+export type OnlineResource = DatasetOnlineResource | ServiceOnlineResource
+
 export type CatalogRecord = ServiceRecord | DatasetRecord
 
 export type CatalogRecordKeys = keyof ServiceRecord | keyof DatasetRecord

package/src/libs/common/domain/src/lib/model/user/user.model.ts

@@ -5,6 +5,6 @@ export interface UserModel {
   name: string
   surname: string
   email: string
-  organisation: string
+  organisation?: string
   profileIcon?: string
 }

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

@@ -4,6 +4,21 @@ import type { Organization } from './model/record/organization.model'
 import { Keyword, UserFeedback } from './model/record'
 import { KeywordType } from './model/thesaurus'
 
+interface RecordAttachment {
+  url: URL
+  fileName: string
+}
+type UploadEvent =
+  | {
+      type: 'progress'
+      progress: number // in percent
+    }
+  | {
+      type: 'success'
+      attachment: RecordAttachment
+      sizeBytes: number
+    }
+
 export abstract class PlatformServiceInterface {
   abstract getType(): string
   abstract getApiVersion(): Observable<string>
@@ -15,12 +30,27 @@ export abstract class PlatformServiceInterface {
     organisation: Organization
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
+
   abstract translateKey(key: string): Observable<string>
+
   abstract searchKeywords(
     query: string,
     keywordTypes: KeywordType[]
   ): Observable<Keyword[]>
   abstract getKeywordsByUri(uri: string): Observable<Keyword[]>
+  abstract searchKeywordsInThesaurus(
+    query: string,
+    thesaurusId: string
+  ): Observable<Keyword[]>
+
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
+
+  abstract getRecordAttachments(
+    recordUuid: string
+  ): Observable<RecordAttachment[]>
+  abstract attachFileToRecord(
+    recordUuid: string,
+    file: File
+  ): Observable<UploadEvent>
 }

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

@@ -52,6 +52,14 @@ export abstract class RecordsRepositoryInterface {
     referenceRecordSource?: string
   ): Observable<string>
 
+  /**
+   * @param uniqueIdentifier
+   * @returns Observable<void> Returns when record is deleted
+   */
+  abstract deleteRecord(uniqueIdentifier: string): Observable<void>
+
+  abstract generateTemporaryId(): string
+
   /**
    * @param record
    * @param referenceRecordSource
@@ -64,7 +72,9 @@ export abstract class RecordsRepositoryInterface {
 
   abstract clearRecordDraft(uniqueIdentifier: string): void
   abstract recordHasDraft(uniqueIdentifier: string): boolean
+  abstract isRecordNotYetSaved(uniqueIdentifier: string): boolean
 
   /** will return all pending drafts, both published and not published */
   abstract getAllDrafts(): Observable<CatalogRecord[]>
+  abstract draftsChanged$: Observable<void>
 }

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

@@ -4,7 +4,7 @@ export * from './lib/search'
 
 export * from './lib/geojson.fixtures'
 export * from './lib/link.fixtures'
-export * from './lib/ol-feature.fixture'
+export * from './lib/ol-feature.fixtures'
 export * from './lib/organisations.fixture'
 export * from './lib/record-link.fixtures'
 export * from './lib/records.fixtures'

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

@@ -1,59 +1,59 @@
-export const EDITOR_CONFIG = () => ({
+export const editorConfigFixture = () => ({
   pages: [
     {
       labelKey: 'Resource description',
-      sections: [EDITOR_SECTION_ABOUT()],
+      sections: [editorSectionAboutFixture()],
     },
     {
       labelKey: 'Resources',
-      sections: [EDITOR_SECTION_CLASSIFICATION()],
+      sections: [editorSectionClassificationFixture()],
     },
     {
       labelKey: 'Access and contact',
       sections: [
-        EDITOR_SECTION_USE_AND_ACCESS_CONDITIONS(),
-        EDITOR_SECTION_DATA_MANAGER(),
+        editorSectionUseAndAccessConditionsFixture(),
+        editorSectionDataManagerFixture(),
       ],
     },
   ],
 })
 
-export const EDITOR_SECTION_ABOUT = () => ({
+export const editorSectionAboutFixture = () => ({
   labelKey: 'About the resource',
   descriptionKey: 'This section describes the resource.',
   hidden: false,
   fields: [
-    EDITOR_FIELD_TITLE(),
-    EDITOR_FIELD_ABSTRACT(),
-    EDITOR_FIELD_RESOURCE_UPDATED(),
-    EDITOR_FIELD_RECORD_UPDATED(),
-    EDITOR_FIELD_UPDATE_FREQUENCY(),
-    EDITOR_FIELD_TEMPORAL_EXTENTS(),
+    editorFieldTitleFixture(),
+    editorFieldAbstractFixture(),
+    editorFieldResourceUpdatedFixture(),
+    editorFieldRecordUpdatedFixture(),
+    editorFieldUpdateFrequencyFixture(),
+    editorFieldTemporalExtentsFixture(),
   ],
 })
 
-export const EDITOR_SECTION_DATA_MANAGER = () => ({
+export const editorSectionDataManagerFixture = () => ({
   labelKey: 'Data manager',
   descriptionKey: '',
   hidden: false,
   fields: [],
 })
 
-export const EDITOR_SECTION_USE_AND_ACCESS_CONDITIONS = () => ({
+export const editorSectionUseAndAccessConditionsFixture = () => ({
   labelKey: 'Data manager',
   descriptionKey: '',
   hidden: false,
-  fields: [EDITOR_FIELD_LICENSE()],
+  fields: [editorFieldLicenseFixture()],
 })
 
-export const EDITOR_SECTION_CLASSIFICATION = () => ({
+export const editorSectionClassificationFixture = () => ({
   labelKey: 'Classification',
   descriptionKey: 'The classification has an impact on the access to the data.',
   hidden: false,
-  fields: [EDITOR_FIELD_KEYWORDS(), EDITOR_FIELD_UNIQUE_IDENTIFIER()],
+  fields: [editorFieldKeywordsFixture(), editorFieldUniqueIdentifierFixture()],
 })
 
-export const EDITOR_FIELD_TITLE = () => ({
+export const editorFieldTitleFixture = () => ({
   model: 'title',
   hidden: false,
   value: 'Accroches vélos MEL',
@@ -62,7 +62,7 @@ export const EDITOR_FIELD_TITLE = () => ({
   },
 })
 
-export const EDITOR_FIELD_ABSTRACT = () => ({
+export const editorFieldAbstractFixture = () => ({
   model: 'abstract',
   hidden: false,
   value: 'Abstract',
@@ -71,7 +71,7 @@ export const EDITOR_FIELD_ABSTRACT = () => ({
   },
 })
 
-export const EDITOR_FIELD_RESOURCE_UPDATED = () => ({
+export const editorFieldResourceUpdatedFixture = () => ({
   model: 'resourceUpdated',
   hidden: false,
   formFieldConfig: {
@@ -79,7 +79,7 @@ export const EDITOR_FIELD_RESOURCE_UPDATED = () => ({
   },
 })
 
-export const EDITOR_FIELD_RECORD_UPDATED = () => ({
+export const editorFieldRecordUpdatedFixture = () => ({
   model: 'recordUpdated',
   hidden: false,
   formFieldConfig: {
@@ -90,7 +90,7 @@ export const EDITOR_FIELD_RECORD_UPDATED = () => ({
   onSaveProcess: '${dateNow()}',
 })
 
-export const EDITOR_FIELD_UPDATE_FREQUENCY = () => ({
+export const editorFieldUpdateFrequencyFixture = () => ({
   model: 'updateFrequency',
   hidden: false,
   formFieldConfig: {
@@ -99,7 +99,7 @@ export const EDITOR_FIELD_UPDATE_FREQUENCY = () => ({
   value: 'unknown',
 })
 
-export const EDITOR_FIELD_TEMPORAL_EXTENTS = () => ({
+export const editorFieldTemporalExtentsFixture = () => ({
   model: 'temporalExtents',
   hidden: false,
   formFieldConfig: {
@@ -108,7 +108,7 @@ export const EDITOR_FIELD_TEMPORAL_EXTENTS = () => ({
   value: [],
 })
 
-export const EDITOR_FIELD_SPATIAL_EXTENTS = () => ({
+export const editorFieldSpatialExtentsFixture = () => ({
   model: 'spatialExtents',
   hidden: false,
   formFieldConfig: {
@@ -116,7 +116,7 @@ export const EDITOR_FIELD_SPATIAL_EXTENTS = () => ({
   },
 })
 
-export const EDITOR_FIELD_KEYWORDS = () => ({
+export const editorFieldKeywordsFixture = () => ({
   model: 'keywords',
   hidden: false,
   formFieldConfig: {
@@ -124,7 +124,7 @@ export const EDITOR_FIELD_KEYWORDS = () => ({
   },
 })
 
-export const EDITOR_FIELD_UNIQUE_IDENTIFIER = () => ({
+export const editorFieldUniqueIdentifierFixture = () => ({
   model: 'uniqueIdentifier',
   hidden: false,
   formFieldConfig: {
@@ -134,7 +134,7 @@ export const EDITOR_FIELD_UNIQUE_IDENTIFIER = () => ({
   value: 'accroche_velos',
 })
 
-export const EDITOR_FIELD_LICENSE = () => ({
+export const editorFieldLicenseFixture = () => ({
   model: 'licenses',
   hidden: false,
   formFieldConfig: {
@@ -143,14 +143,14 @@ export const EDITOR_FIELD_LICENSE = () => ({
   },
 })
 
-export const EDITOR_FIELDS = () => [
-  EDITOR_FIELD_TITLE(),
-  EDITOR_FIELD_ABSTRACT(),
-  EDITOR_FIELD_RESOURCE_UPDATED(),
-  EDITOR_FIELD_RECORD_UPDATED(),
-  EDITOR_FIELD_UPDATE_FREQUENCY(),
-  EDITOR_FIELD_TEMPORAL_EXTENTS(),
-  EDITOR_FIELD_SPATIAL_EXTENTS(),
-  EDITOR_FIELD_KEYWORDS(),
-  EDITOR_FIELD_UNIQUE_IDENTIFIER(),
+export const editorFieldsFixture = () => [
+  editorFieldTitleFixture(),
+  editorFieldAbstractFixture(),
+  editorFieldResourceUpdatedFixture(),
+  editorFieldRecordUpdatedFixture(),
+  editorFieldUpdateFrequencyFixture(),
+  editorFieldTemporalExtentsFixture(),
+  editorFieldSpatialExtentsFixture(),
+  editorFieldKeywordsFixture(),
+  editorFieldUniqueIdentifierFixture(),
 ]

package/src/libs/common/fixtures/src/lib/elasticsearch/{aggregations-request.ts → aggregations-request.fixtures.ts}

@@ -1,6 +1,4 @@
-import { deepFreeze } from '../utils/freeze'
-
-export const ES_FIXTURE_AGGS_REQUEST = deepFreeze({
+export const elasticAggsRequestFixture = () => ({
   'tag.default': { terms: { field: 'tag.default', include: '.*', size: 10 } },
   availableInServices: {
     filters: {

package/src/libs/common/fixtures/src/lib/elasticsearch/{aggregations-response.ts → aggregations-response.fixtures.ts}

@@ -1,6 +1,4 @@
-import { deepFreeze } from '../utils/freeze'
-
-const BUCKETS = deepFreeze([
+const elasticBucketsFixture = () => [
   { key: 'Hungary', doc_count: 20 },
   {
     key: 'Austria',
@@ -16,13 +14,13 @@ const BUCKETS = deepFreeze([
     key: 'Cyprus',
     doc_count: 5,
   },
-])
+]
 
-export const ES_FIXTURE_AGGS_RESPONSE = deepFreeze({
+export const elasticAggsResponseFixture = () => ({
   'tag.default': {
     doc_count_error_upper_bound: 0,
     sum_other_doc_count: 458,
-    buckets: BUCKETS,
+    buckets: elasticBucketsFixture(),
   },
   availableInServices: {
     buckets: {
@@ -66,12 +64,12 @@ export const ES_FIXTURE_AGGS_RESPONSE = deepFreeze({
   },
 })
 
-export const ES_FIXTURE_AGGS_RESPONSE_MORE = deepFreeze({
+export const elasticAggsResponseMoreFixture = () => ({
   'tag.default': {
     doc_count_error_upper_bound: 0,
     sum_other_doc_count: 456,
     buckets: [
-      ...BUCKETS,
+      ...elasticBucketsFixture(),
       { key: 'Spain', doc_count: 86 },
       { key: 'United Kingdom', doc_count: 84 },
     ],

package/src/libs/common/fixtures/src/lib/elasticsearch/{full-response.ts → full-response.fixtures.ts}

@@ -1,6 +1,4 @@
-import { deepFreeze } from '../utils/freeze'
-
-export const ES_FIXTURE_FULL_RESPONSE = deepFreeze({
+export const elasticFullResponseFixture = () => ({
   took: 1,
   timed_out: false,
   _shards: { total: 1, successful: 1, skipped: 0, failed: 0 },

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

@@ -1,6 +1,6 @@
-export * from './search-requests'
-export * from './search-responses'
-export * from './aggregations-request'
-export * from './aggregations-response'
-export * from './full-response'
+export * from './search-requests.fixtures'
+export * from './search-responses.fixtures'
+export * from './aggregations-request.fixtures'
+export * from './aggregations-response.fixtures'
+export * from './full-response.fixtures'
 export * from './metadata-links.fixtures'

package/src/libs/common/fixtures/src/lib/elasticsearch/metadata-links.fixtures.ts

@@ -1,6 +1,4 @@
-import { deepFreeze } from '../utils'
-
-export const ES_LINK_FIXTURES: Record<string, unknown> = deepFreeze({
+export const elasticLinkFixture = (): Record<string, unknown> => ({
   readmeLink: {
     protocol: 'WWW:LINK',
     description: 'Readme page',