geonetwork-ui 2.4.0-dev.fdf8f64b → 2.4.1-dev.c1a684900

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

@@ -1,6 +1,12 @@
 import { Injectable } from '@angular/core'
-import { combineLatest, Observable, of, switchMap } from 'rxjs'
-import { catchError, filter, map, shareReplay, tap } from 'rxjs/operators'
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  shareReplay,
+  tap,
+} from 'rxjs/operators'
 import {
   MeApiService,
   RecordsApiService,
@@ -10,9 +16,13 @@ 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 {
+  CatalogRecord,
   Keyword,
   Organization,
   UserFeedback,
@@ -26,6 +36,15 @@ 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'
+import {
+  combineLatest,
+  forkJoin,
+  Observable,
+  of,
+  switchMap,
+  throwError,
+} from 'rxjs'
 
 const minApiVersion = '4.2.2'
 
@@ -288,34 +307,97 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     )
   }
 
-  attachFileToRecord(recordUuid: string, file: File) {
+  cleanRecordAttachments(record: CatalogRecord): Observable<void> {
+    return combineLatest([
+      this.recordsApiService.getAssociatedResources(record.uniqueIdentifier),
+      this.recordsApiService.getAllResources(record.uniqueIdentifier),
+    ]).pipe(
+      map(([associatedResources, recordResources]) => {
+        // Received object from API is not a RelatedResponseApiModel, so we need
+        // to cast it as any and do the bellow mappings to get the wanted values.
+        const resourceIdsToKeep = [
+          ...((associatedResources as any).onlines ?? []).map(
+            (o) => Object.values(o.title)[0]
+          ),
+          ...((associatedResources as any).thumbnails ?? []).map(
+            (o) => Object.values(o.title)[0]
+          ),
+        ]
+
+        const resourceIdsToRemove = recordResources
+          .map((r) => r.filename)
+          .filter((resourceId) => !resourceIdsToKeep.includes(resourceId))
+
+        return resourceIdsToRemove
+      }),
+      mergeMap((resourceIdsToRemove) =>
+        forkJoin(
+          resourceIdsToRemove.map((attachementId) =>
+            this.recordsApiService.delResource(
+              record.uniqueIdentifier,
+              attachementId
+            )
+          )
+        ).pipe(map(() => undefined))
+      ),
+      catchError((error) => {
+        console.error('Error while cleaning attachments:', error)
+        throw error
+      })
+    )
+  }
+
+  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/dataviz/dataviz-configuration.model.ts

@@ -9,7 +9,7 @@ export const CHART_TYPE_VALUES = [
   'pie',
 ] as const
 
-export type InputChartType = typeof CHART_TYPE_VALUES[number]
+export type InputChartType = (typeof CHART_TYPE_VALUES)[number]
 
 export interface DatavizConfigurationModel {
   xProperty: string

package/src/libs/common/domain/src/lib/model/error/index.ts

@@ -0,0 +1 @@
+export * from './publication-version.error'

package/src/libs/common/domain/src/lib/model/error/publication-version.error.ts

@@ -0,0 +1,9 @@
+export class PublicationVersionError extends Error {
+  detectedApiVersion: string
+
+  constructor(detectedApiVersion: string) {
+    super()
+    this.name = 'PublicationVersionError'
+    this.detectedApiVersion = detectedApiVersion
+  }
+}

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

@@ -52,7 +52,7 @@ export const RoleLabels = new Map<Role, string>([
   ['user', marker('domain.contact.role.user')],
 ])
 
-export type Role = typeof RoleValues[number]
+export type Role = (typeof RoleValues)[number]
 
 export interface Individual {
   firstName?: string

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

@@ -2,3 +2,4 @@ export * from './contact.model'
 export * from './organization.model'
 export * from './metadata.model'
 export * from './user-feedbacks.model'
+export * from './translation.model'

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

@@ -3,6 +3,14 @@ import type { Individual } from './contact.model'
 import type { Organization } from './organization.model'
 import type { Geometry } from 'geojson'
 import { KeywordType, ThesaurusModel } from '../thesaurus'
+import {
+  ConstraintTranslations,
+  KeywordTranslations,
+  LanguageCode,
+  OnlineResourceTranslations,
+  RecordTranslations,
+  SpatialExtentTranslations,
+} from './translation.model'
 
 type Uuid = string
 
@@ -32,7 +40,7 @@ export type UpdateFrequencyCustom = {
 }
 export type UpdateFrequency = UpdateFrequencyCode | UpdateFrequencyCustom
 
-export type RecordKind = 'dataset' | 'service'
+export type RecordKind = 'dataset' | 'service' | 'reuse'
 
 marker('domain.record.status.completed')
 marker('domain.record.status.ongoing')
@@ -47,11 +55,13 @@ export const RecordStatusValues = [
   'deprecated',
   'removed',
 ]
-export type RecordStatus = typeof RecordStatusValues[number]
+export type RecordStatus = (typeof RecordStatusValues)[number]
 
 export type Constraint = {
   text: string
   url?: URL
+
+  translations?: ConstraintTranslations
 }
 
 export type SpatialRepresentationType =
@@ -68,9 +78,9 @@ export interface Keyword {
   type: KeywordType
   thesaurus?: ThesaurusModel
   bbox?: [number, number, number, number]
+
+  translations?: KeywordTranslations
 }
-// languages should be expressed using two-letters ISO 639-1 codes
-export type LanguageCode = string
 
 export interface BaseRecord {
   uniqueIdentifier: Uuid
@@ -81,7 +91,6 @@ export interface BaseRecord {
   recordCreated?: Date
   recordPublished?: Date
   recordUpdated: Date
-  languages: Array<LanguageCode>
   kind: RecordKind
   topics: Array<string> // TODO: handle codelists
   keywords: Array<Keyword>
@@ -95,11 +104,18 @@ export interface BaseRecord {
   updateFrequency?: UpdateFrequency
 
   // information related to the resource (dataset, service)
+  resourceIdentifier?: string
   contactsForResource: Array<Individual>
   resourceCreated?: Date
   resourcePublished?: Date
   resourceUpdated?: Date
 
+  // multilingual support
+  defaultLanguage: LanguageCode
+  otherLanguages: Array<LanguageCode> // this should include all non-default languages present in the metadata, even if incompletely translated
+
+  translations?: RecordTranslations
+
   // to add: canonical url
   // to add: source catalog (??)
   // to add: is open data ?
@@ -113,6 +129,7 @@ export type ServiceProtocol =
   | 'wmts'
   | 'esriRest'
   | 'ogcFeatures'
+  | 'GPFDL'
   | 'other'
 
 export type OnlineResourceType = 'service' | 'download' | 'link' | 'endpoint'
@@ -124,6 +141,7 @@ export interface DatasetServiceDistribution {
   identifierInService?: string
   name?: string
   description?: string
+  translations?: OnlineResourceTranslations
 }
 
 export interface DatasetDownloadDistribution {
@@ -137,6 +155,7 @@ export interface DatasetDownloadDistribution {
   name?: string
   description?: string
   accessServiceProtocol?: ServiceProtocol
+  translations?: OnlineResourceTranslations
 }
 
 export interface OnlineLinkResource {
@@ -144,6 +163,7 @@ export interface OnlineLinkResource {
   url: URL
   name?: string
   description?: string
+  translations?: OnlineResourceTranslations
 }
 
 export type DatasetOnlineResource = (
@@ -163,6 +183,7 @@ export interface DatasetSpatialExtent {
   bbox?: [number, number, number, number]
   geometry?: Geometry
   description?: string
+  translations?: SpatialExtentTranslations
 }
 
 /**
@@ -189,6 +210,7 @@ export interface ServiceEndpoint {
   protocol: string
   type: 'endpoint'
   description?: string
+  translations?: OnlineResourceTranslations
 }
 
 export type ServiceOnlineResource = (ServiceEndpoint | OnlineLinkResource) & {
@@ -198,10 +220,25 @@ export type ServiceOnlineResource = (ServiceEndpoint | OnlineLinkResource) & {
 export interface ServiceRecord extends BaseRecord {
   kind: 'service'
   onlineResources: Array<ServiceOnlineResource>
+  spatialExtents: Array<DatasetSpatialExtent>
 }
 
+export interface ReuseRecord extends BaseRecord {
+  kind: 'reuse'
+  lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  onlineResources: Array<OnlineLinkResource>
+  reuseType: ReuseType
+  spatialExtents: Array<DatasetSpatialExtent>
+  temporalExtents: Array<DatasetTemporalExtent>
+}
+
+export type ReuseType = 'application' | 'map' | 'other'
+
 export type OnlineResource = DatasetOnlineResource | ServiceOnlineResource
 
-export type CatalogRecord = ServiceRecord | DatasetRecord
+export type CatalogRecord = DatasetRecord | ReuseRecord | ServiceRecord
 
-export type CatalogRecordKeys = keyof ServiceRecord | keyof DatasetRecord
+export type CatalogRecordKeys =
+  | keyof DatasetRecord
+  | keyof ReuseRecord
+  | keyof ServiceRecord

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

@@ -1,3 +1,5 @@
+import { OrganizationTranslations } from './translation.model'
+
 export interface Organization {
   name: string
   email?: string
@@ -5,4 +7,6 @@ export interface Organization {
   website?: URL
   logoUrl?: URL
   recordCount?: number
+
+  translations?: OrganizationTranslations
 }

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

@@ -0,0 +1,49 @@
+// languages should be expressed using two-letters ISO 639-1 codes
+export type LanguageCode = string
+
+// Translations are organized like so (assuming `en` is the default language of the record):
+// {
+//   "Text in English": {
+//     "fr": "Texte en français",
+//     "it": "Testo in italiano",
+//     "de": "Text auf Deutsch",
+//   },
+//   ...
+// }
+export type FieldTranslation = Record<LanguageCode, string>
+
+export interface RecordTranslations {
+  title?: FieldTranslation
+  abstract?: FieldTranslation
+  lineage?: FieldTranslation
+}
+
+export interface OrganizationTranslations {
+  name?: FieldTranslation
+}
+
+export interface KeywordTranslations {
+  label?: FieldTranslation
+  description?: FieldTranslation
+}
+
+export interface ConstraintTranslations {
+  text?: FieldTranslation
+}
+
+export interface OnlineResourceTranslations {
+  name?: FieldTranslation
+  description?: FieldTranslation
+}
+
+export interface SpatialExtentTranslations {
+  description?: FieldTranslation
+}
+
+export type ModelTranslations =
+  | RecordTranslations
+  | OrganizationTranslations
+  | KeywordTranslations
+  | ConstraintTranslations
+  | OnlineResourceTranslations
+  | SpatialExtentTranslations

package/src/libs/common/domain/src/lib/model/search/filter.model.ts

@@ -2,5 +2,21 @@ import { FieldName } from './field.model'
 
 export type FieldFilterByValues = Record<string, boolean>
 export type FieldFilterByExpression = string | number
-export type FieldFilter = FieldFilterByExpression | FieldFilterByValues
+export type FieldFilterByRange = {
+  start?: Date
+  end?: Date
+}
+
+export type FieldFilter =
+  | FieldFilterByExpression
+  | FieldFilterByValues
+  | FieldFilterByRange
 export type FieldFilters = Record<FieldName, FieldFilter>
+
+export type QueryString = {
+  query_string: string
+}
+export type QueryRange = {
+  range: Record<string, { format: string; gte: string; lte: string }>
+}
+export type FilterQuery = Array<QueryString | QueryRange>

package/src/libs/common/domain/src/lib/model/search/sort-by.model.ts

@@ -5,4 +5,5 @@ export const SortByEnum: Record<string, SortByField> = {
   POPULARITY: ['desc', 'userSavedCount'],
   RELEVANCY: ['desc', '_score'],
   QUALITY_SCORE: ['desc', 'qualityScore'],
+  CHANGE_DATE: ['desc', 'changeDate'],
 }

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

@@ -1,14 +1,14 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
-import { Keyword, UserFeedback } from './model/record'
+import { CatalogRecord, 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
@@ -49,6 +49,7 @@ export abstract class PlatformServiceInterface {
   abstract getRecordAttachments(
     recordUuid: string
   ): Observable<RecordAttachment[]>
+  abstract cleanRecordAttachments(recordUuid: CatalogRecord): Observable<void>
   abstract attachFileToRecord(
     recordUuid: string,
     file: File

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

@@ -86,5 +86,9 @@ export abstract class RecordsRepositoryInterface {
 
   /** will return all pending drafts, both published and not published */
   abstract getAllDrafts(): Observable<CatalogRecord[]>
+  abstract getDraftsCount(): Observable<number>
   abstract draftsChanged$: Observable<void>
+  abstract hasRecordChangedSinceDraft(
+    localRecord: CatalogRecord
+  ): Observable<{ user: string; date: Date }>
 }

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

@@ -25,6 +25,7 @@ export const editorSectionAboutFixture = () => ({
   fields: [
     editorFieldTitleFixture(),
     editorFieldAbstractFixture(),
+    editorFieldResourceCreatedFixture(),
     editorFieldResourceUpdatedFixture(),
     editorFieldRecordUpdatedFixture(),
     editorFieldUpdateFrequencyFixture(),
@@ -71,6 +72,14 @@ export const editorFieldAbstractFixture = () => ({
   },
 })
 
+export const editorFieldResourceCreatedFixture = () => ({
+  model: 'resourceCreated',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.resourceCreated',
+  },
+})
+
 export const editorFieldResourceUpdatedFixture = () => ({
   model: 'resourceUpdated',
   hidden: false,
@@ -84,7 +93,6 @@ export const editorFieldRecordUpdatedFixture = () => ({
   hidden: false,
   formFieldConfig: {
     labelKey: 'editor.record.form.field.recordUpdated',
-    locked: true,
   },
   value: '2024-07-16T05:18:53.000Z',
   onSaveProcess: '${dateNow()}',
@@ -129,7 +137,6 @@ export const editorFieldUniqueIdentifierFixture = () => ({
   hidden: false,
   formFieldConfig: {
     labelKey: 'editor.record.form.field.uniqueIdentifier',
-    locked: true,
   },
   value: 'accroche_velos',
 })
@@ -139,7 +146,6 @@ export const editorFieldLicenseFixture = () => ({
   hidden: false,
   formFieldConfig: {
     labelKey: 'editor.record.form.field.license',
-    locked: true,
   },
 })
 
@@ -147,6 +153,7 @@ export const editorFieldsFixture = () => [
   editorFieldTitleFixture(),
   editorFieldAbstractFixture(),
   editorFieldResourceUpdatedFixture(),
+  editorFieldResourceCreatedFixture(),
   editorFieldRecordUpdatedFixture(),
   editorFieldUpdateFrequencyFixture(),
   editorFieldTemporalExtentsFixture(),