geonetwork-ui 2.3.0-dev.3d65a13b → 2.3.0-dev.3e7f46f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geonetwork-ui",
-  "version": "2.3.0-dev.3d65a13b",
+  "version": "2.3.0-dev.3e7f46f3",
   "engines": {
     "node": ">=14.17.0"
   },
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "@biesbjerg/ngx-translate-extract-marker": "^1.0.0",
-    "@camptocamp/ogc-client": "^1.1.0-RC.3",
+    "@camptocamp/ogc-client": "1.1.1-dev.ad6d9ab",
     "@geospatial-sdk/geocoding": "^0.0.5-alpha.2",
     "@ltd/j-toml": "~1.35.2",
     "@messageformat/core": "^3.0.1",

package/src/libs/api/metadata-converter/src/lib/fixtures/generic.records.ts

@@ -195,7 +195,15 @@ As such, **it is not very interesting at all.**`,
     },
   ],
   spatialExtents: [],
-  temporalExtents: [],
+  temporalExtents: [
+    {
+      start: new Date('2024-05-24'),
+      end: null,
+    },
+    {
+      start: new Date('2024-05-30'),
+    },
+  ],
   updateFrequency: {
     updatedTimes: 3,
     per: 'month',

package/src/libs/api/metadata-converter/src/lib/gn4/gn4.field.mapper.ts

@@ -120,10 +120,16 @@ export class Gn4FieldMapper {
     }),
     creationDateForResource: (output, source) => ({
       ...output,
-      datasetCreated: toDate(
+      resourceCreated: toDate(
         getFirstValue(selectField<string>(source, 'creationDateForResource'))
       ),
     }),
+    revisionDateForResource: (output, source) => ({
+      ...output,
+      resourceUpdated: toDate(
+        getFirstValue(selectField<string>(source, 'revisionDateForResource'))
+      ),
+    }),
     createDate: (output, source) => ({
       ...output,
       recordCreated: toDate(selectField<string>(source, 'createDate')),

package/src/libs/api/metadata-converter/src/lib/iso19115-3/iso19115-3.converter.ts

@@ -1,4 +1,7 @@
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { XmlElement } from '@rgrove/parse-xml'
 import { Iso19139Converter } from '../iso19139'
+import { renameElements } from '../xml-utils'
 import {
   readContacts,
   readDistributions,
@@ -30,9 +33,6 @@ import {
   writeStatus,
   writeUniqueIdentifier,
 } from './write-parts'
-import { XmlElement } from '@rgrove/parse-xml'
-import { renameElements } from '../xml-utils'
-import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 export class Iso191153Converter extends Iso19139Converter {
   constructor() {

package/src/libs/api/metadata-converter/src/lib/iso19139/iso19139.converter.ts

@@ -4,6 +4,9 @@ import {
   DatasetRecord,
   ServiceRecord,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { XmlElement } from '@rgrove/parse-xml'
+import { BaseConverter } from '../base.converter'
+import { isEqual } from '../convert-utils'
 import {
   createDocument,
   createElement,
@@ -11,32 +14,6 @@ import {
   parseXmlString,
   xmlToString,
 } from '../xml-utils'
-import {
-  writeAbstract,
-  writeContacts,
-  writeContactsForResource,
-  writeDistributions,
-  writeGraphicOverviews,
-  writeKeywords,
-  writeKind,
-  writeLegalConstraints,
-  writeLicenses,
-  writeLineage,
-  writeOnlineResources,
-  writeOtherConstraints,
-  writeOwnerOrganization,
-  writeRecordUpdated,
-  writeResourceCreated,
-  writeResourcePublished,
-  writeResourceUpdated,
-  writeSecurityConstraints,
-  writeSpatialRepresentation,
-  writeStatus,
-  writeTitle,
-  writeTopics,
-  writeUniqueIdentifier,
-  writeUpdateFrequency,
-} from './write-parts'
 import {
   readAbstract,
   readContacts,
@@ -59,13 +36,38 @@ import {
   readSecurityConstraints,
   readSpatialRepresentation,
   readStatus,
+  readTemporalExtents,
   readTitle,
   readUniqueIdentifier,
   readUpdateFrequency,
 } from './read-parts'
-import { isEqual } from '../convert-utils'
-import { BaseConverter } from '../base.converter'
-import { XmlElement } from '@rgrove/parse-xml'
+import {
+  writeAbstract,
+  writeContacts,
+  writeContactsForResource,
+  writeDistributions,
+  writeGraphicOverviews,
+  writeKeywords,
+  writeKind,
+  writeLegalConstraints,
+  writeLicenses,
+  writeLineage,
+  writeOnlineResources,
+  writeOtherConstraints,
+  writeOwnerOrganization,
+  writeRecordUpdated,
+  writeResourceCreated,
+  writeResourcePublished,
+  writeResourceUpdated,
+  writeSecurityConstraints,
+  writeSpatialRepresentation,
+  writeStatus,
+  writeTemporalExtents,
+  writeTitle,
+  writeTopics,
+  writeUniqueIdentifier,
+  writeUpdateFrequency,
+} from './write-parts'
 
 export class Iso19139Converter extends BaseConverter<string> {
   protected readers: Record<
@@ -98,9 +100,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: readLineage,
     distributions: readDistributions,
     onlineResources: readOnlineResources,
+    temporalExtents: readTemporalExtents,
     // TODO
     spatialExtents: () => [],
-    temporalExtents: () => [],
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => [],
@@ -136,9 +138,9 @@ export class Iso19139Converter extends BaseConverter<string> {
     lineage: writeLineage,
     distributions: writeDistributions,
     onlineResources: writeOnlineResources,
+    temporalExtents: writeTemporalExtents,
     // TODO
     spatialExtents: () => undefined,
-    temporalExtents: () => undefined,
     extras: () => undefined,
     landingPage: () => undefined,
     languages: () => undefined,
@@ -311,6 +313,8 @@ export class Iso19139Converter extends BaseConverter<string> {
       fieldChanged('spatialRepresentation') &&
         this.writers['spatialRepresentation'](record, rootEl)
       fieldChanged('overviews') && this.writers['overviews'](record, rootEl)
+      fieldChanged('temporalExtents') &&
+        this.writers['temporalExtents'](record, rootEl)
       fieldChanged('distributions') &&
         this.writers['distributions'](record, rootEl)
       fieldChanged('lineage') && this.writers['lineage'](record, rootEl)

package/src/libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -14,18 +14,7 @@ import {
   UpdateFrequency,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { getStatusFromStatusCode } from './utils/status.mapper'
-import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
-import {
-  findChildElement,
-  findChildrenElement,
-  findNestedElement,
-  findNestedElements,
-  findParent,
-  readAttribute,
-  readText,
-  XmlElement,
-} from '../xml-utils'
+import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
 import {
   ChainableFunction,
   combine,
@@ -37,10 +26,21 @@ import {
   mapArray,
   pipe,
 } from '../function-utils'
-import { getRoleFromRoleCode } from './utils/role.mapper'
-import { matchMimeType, matchProtocol } from '../common/distribution.mapper'
-import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import {
+  XmlElement,
+  findChildElement,
+  findChildrenElement,
+  findNestedElement,
+  findNestedElements,
+  findParent,
+  readAttribute,
+  readText,
+} from '../xml-utils'
 import { fullNameToParts } from './utils/individual-name'
+import { getKeywordTypeFromKeywordTypeCode } from './utils/keyword.mapper'
+import { getRoleFromRoleCode } from './utils/role.mapper'
+import { getStatusFromStatusCode } from './utils/status.mapper'
+import { getUpdateFrequencyFromFrequencyCode } from './utils/update-frequency.mapper'
 
 export function extractCharacterString(): ChainableFunction<
   XmlElement,
@@ -434,7 +434,7 @@ export function getUpdateFrequencyFromCustomPeriod(
   } else if (days <= 7) {
     return {
       per: 'week',
-      updatedTimes: Math.round(7 / days),
+      updatedTimes: Math.round(7 / days - 0.0001), // this is to make sure that 'every 2 days' = '3 times per week'
     }
   } else if (days) {
     return {
@@ -843,3 +843,55 @@ export function readOnlineResources(
     flattenArray()
   )(rootEl)
 }
+
+export function readTemporalExtents(rootEl: XmlElement) {
+  return pipe(
+    findIdentification(),
+    findNestedElements('gmd:extent', 'gmd:EX_Extent', 'gmd:temporalElement'),
+    mapArray(
+      combine(
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimePeriod'
+        ),
+        findNestedElement(
+          'gmd:EX_TemporalExtent',
+          'gmd:extent',
+          'gml:TimeInstant'
+        )
+      )
+    ),
+    mapArray(([periodEl, instantEl]) => {
+      if (periodEl) {
+        return pipe(
+          combine(
+            pipe(
+              findChildElement('gml:beginPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            ),
+            pipe(
+              findChildElement('gml:endPosition', false),
+              readText(),
+              map((dateStr) => (dateStr ? new Date(dateStr) : null))
+            )
+          ),
+          map(([start, end]) => ({
+            start,
+            end,
+          }))
+        )(periodEl)
+      } else {
+        return pipe(
+          findChildElement('gml:timePosition', false),
+          readText(),
+          map((dateStr) => (dateStr ? new Date(dateStr) : null)),
+          map((date) => ({
+            start: date,
+          }))
+        )(instantEl)
+      }
+    })
+  )(rootEl)
+}

package/src/libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -15,7 +15,20 @@ import {
   UpdateFrequencyCode,
   UpdateFrequencyCustom,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
+import format from 'date-fns/format'
+import {
+  ChainableFunction,
+  fallback,
+  filterArray,
+  getAtIndex,
+  map,
+  mapArray,
+  noop,
+  pipe,
+  tap,
+} from '../function-utils'
 import {
+  XmlElement,
   addAttribute,
   appendChildren,
   createChild,
@@ -24,29 +37,13 @@ import {
   findChildOrCreate,
   findChildrenElement,
   findNestedChildOrCreate,
-  findNestedElement,
   findNestedElements,
   readAttribute,
-  readText,
   removeAllChildren,
   removeChildren,
   removeChildrenByName,
   setTextContent,
-  XmlElement,
 } from '../xml-utils'
-import {
-  ChainableFunction,
-  combine,
-  fallback,
-  filterArray,
-  getAtIndex,
-  map,
-  mapArray,
-  noop,
-  pipe,
-  tap,
-} from '../function-utils'
-import format from 'date-fns/format'
 import { readKind } from './read-parts'
 import { namePartsToFull } from './utils/individual-name'
 
@@ -220,7 +217,7 @@ export function getISODuration(updateFrequency: UpdateFrequencyCustom): string {
       else duration.hours = Math.round(24 / updateFrequency.updatedTimes)
       break
     case 'week':
-      duration.days = Math.round(7 / updateFrequency.updatedTimes)
+      duration.days = Math.round(7 / updateFrequency.updatedTimes - 0.0001) // this is to make sure that '2 times per week' = 'every 3 days'
       break
     case 'month':
       if (updateFrequency.updatedTimes <= 1) duration.months = 1
@@ -1129,3 +1126,61 @@ export function writeOnlineResources(
     appendChildren(...record.onlineResources.map(createOnlineResource))
   )(rootEl)
 }
+
+export function writeTemporalExtents(
+  record: DatasetRecord,
+  rootEl: XmlElement
+) {
+  pipe(
+    findOrCreateIdentification(),
+    findNestedChildOrCreate('gmd:extent', 'gmd:EX_Extent'),
+    removeChildrenByName('gmd:temporalElement'),
+    appendChildren(
+      ...record.temporalExtents.map((extent) =>
+        pipe(
+          createElement('gmd:temporalElement'),
+          createChild('gmd:EX_TemporalExtent'),
+          appendChildren(
+            'start' in extent && 'end' in extent
+              ? pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimePeriod'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:beginPosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    ),
+                    pipe(
+                      createElement('gml:endPosition'),
+                      pipe(
+                        extent.end
+                          ? setTextContent(format(extent.end, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+              : pipe(
+                  createElement('gmd:extent'),
+                  createChild('gml:TimeInstant'),
+                  appendChildren(
+                    pipe(
+                      createElement('gml:timePosition'),
+                      pipe(
+                        extent.start
+                          ? setTextContent(format(extent.start, 'yyyy-MM-dd'))
+                          : addAttribute('indeterminatePosition', 'unknown')
+                      )
+                    )
+                  )
+                )
+          )
+        )
+      )
+    )
+  )(rootEl)
+}

package/src/libs/api/repository/src/lib/gn4/auth/avatar.service.interface.ts

@@ -3,4 +3,5 @@ import { Observable } from 'rxjs'
 export abstract class AvatarServiceInterface {
   public abstract getPlaceholder(): Observable<string>
   public abstract getProfileIcon(...args): Observable<string>
+  public abstract getProfileIconUrl(userId: string): Promise<string>
 }

package/src/libs/api/repository/src/lib/gn4/auth/gravatar.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'
 import { AvatarServiceInterface } from './avatar.service.interface'
 import { Gn4SettingsService } from '../settings/gn4-settings.service'
 import { map } from 'rxjs/operators'
-import { Observable } from 'rxjs'
+import { firstValueFrom, Observable } from 'rxjs'
 
 @Injectable({
   providedIn: 'root',
@@ -14,6 +14,7 @@ export class GravatarService implements AvatarServiceInterface {
   private readonly identicon$ = this.gn4SettingsService.identicon$.pipe(
     map((identicon) => identicon?.replace('gravatar:', ''))
   )
+
   constructor(private gn4SettingsService: Gn4SettingsService) {}
 
   getPlaceholder(): Observable<string> {
@@ -26,4 +27,14 @@ export class GravatarService implements AvatarServiceInterface {
       map((identicon) => `${this.GRAVATAR_URL}${hash}?d=${identicon}`)
     )
   }
+
+  async getProfileIconUrl(userId: string) {
+    let iconUrl = ''
+    try {
+      iconUrl = await firstValueFrom(this.getProfileIcon(userId))
+    } catch (error) {
+      return ''
+    }
+    return iconUrl
+  }
 }

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

@@ -1,17 +1,23 @@
 import {
   MeResponseApiModel,
   UserApiModel,
+  UserFeedbackDTOApiModel,
 } from '../../../../../../../libs/data-access/gn4/src'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import { Injectable } from '@angular/core'
-import { AvatarServiceInterface } from '../auth/avatar.service.interface'
+import { AvatarServiceInterface } from '../auth'
 import { map } from 'rxjs/operators'
 import { Observable, of } from 'rxjs'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
+import {
+  UserFeedback,
+  UserFeedbackViewModel,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Injectable()
 export class Gn4PlatformMapper {
   constructor(private avatarService: AvatarServiceInterface) {}
+
   userFromMeApi(apiUser: MeResponseApiModel): Observable<UserModel | null> {
     if (!apiUser) return of(null)
     const {
@@ -28,6 +34,7 @@ export class Gn4PlatformMapper {
       .getProfileIcon(hash)
       .pipe(map((profileIcon) => ({ ...user, profileIcon } as UserModel)))
   }
+
   userFromApi(apiUser: UserApiModel): UserModel {
     if (!apiUser) return null
     const {
@@ -65,4 +72,47 @@ export class Gn4PlatformMapper {
       }
     })
   }
+
+  userFeedbacksFromApi(userFeedback: any): UserFeedback {
+    return {
+      uuid: userFeedback.uuid,
+      metadataUUID: userFeedback.metadataUUID,
+      comment: userFeedback.comment,
+      authorUserId: userFeedback.authorUserId.toString(),
+      authorName: userFeedback.authorName,
+      authorEmail: userFeedback.authorEmail,
+      published: userFeedback.published,
+      parentUuid: userFeedback.parentUuid ?? undefined,
+      date: new Date(userFeedback.date),
+    }
+  }
+
+  userFeedbacksToApi(
+    userFeedback: UserFeedback
+  ): Partial<UserFeedbackDTOApiModel> {
+    return {
+      uuid: userFeedback.uuid,
+      metadataUUID: userFeedback.metadataUUID,
+      comment: userFeedback.comment,
+      authorUserId: Number.parseInt(userFeedback.authorUserId),
+      authorName: userFeedback.authorName,
+      authorEmail: userFeedback.authorEmail,
+      published: userFeedback.published,
+      parentUuid: userFeedback.parentUuid,
+      date: userFeedback.date.getTime().toString(),
+    }
+  }
+
+  async createUserFeedbackViewModel(
+    baseUserFeedback: UserFeedback
+  ): Promise<UserFeedbackViewModel> {
+    const userAvatarUrl = await this.avatarService.getProfileIconUrl(
+      baseUserFeedback.authorUserId?.toString()
+    )
+
+    return {
+      ...baseUserFeedback,
+      avatarUrl: userAvatarUrl,
+    }
+  }
 }

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

@@ -6,11 +6,15 @@ import {
   RegistriesApiService,
   SiteApiService,
   ToolsApiService,
+  UserfeedbackApiService,
   UsersApiService,
 } from '../../../../../../../libs/data-access/gn4/src'
 import { PlatformServiceInterface } from '../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { UserModel } from '../../../../../../../libs/common/domain/src/lib/model/user/user.model'
-import { Organization } from '../../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  Organization,
+  UserFeedback,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { Gn4PlatformMapper } from './gn4-platform.mapper'
 import { ltr } from 'semver'
 import { ThesaurusModel } from '../../../../../../../libs/common/domain/src/lib/model/thesaurus/thesaurus.model'
@@ -21,9 +25,9 @@ const minApiVersion = '4.2.2'
 @Injectable()
 export class Gn4PlatformService implements PlatformServiceInterface {
   private readonly type = 'GeoNetwork'
-  private me$: Observable<UserModel>
-  private users$: Observable<UserModel[]>
-  private isAnonymous$: Observable<boolean>
+  private readonly me$: Observable<UserModel>
+  private readonly users$: Observable<UserModel[]>
+  private readonly isUserAnonymous$: Observable<boolean>
 
   private keyTranslations$ = this.toolsApiService
     .getTranslationsPackage1('gnui')
@@ -65,13 +69,18 @@ export class Gn4PlatformService implements PlatformServiceInterface {
     private mapper: Gn4PlatformMapper,
     private toolsApiService: ToolsApiService,
     private registriesApiService: RegistriesApiService,
-    private langService: LangService
+    private langService: LangService,
+    private userfeedbackApiService: UserfeedbackApiService
   ) {
     this.me$ = this.meApi.getMe().pipe(
       switchMap((apiUser) => this.mapper.userFromMeApi(apiUser)),
       shareReplay({ bufferSize: 1, refCount: true })
     )
-    this.isAnonymous$ = this.me$.pipe(map((user) => !user || !('id' in user)))
+
+    this.isUserAnonymous$ = this.me$.pipe(
+      map((user) => !user || !('id' in user))
+    )
+
     this.users$ = this.usersApi.getUsers().pipe(
       map((users) => users.map((user) => this.mapper.userFromApi(user))),
       shareReplay()
@@ -91,7 +100,7 @@ export class Gn4PlatformService implements PlatformServiceInterface {
   }
 
   isAnonymous(): Observable<boolean> {
-    return this.isAnonymous$
+    return this.isUserAnonymous$
   }
 
   getOrganizations(): Observable<Organization[]> {
@@ -148,6 +157,30 @@ export class Gn4PlatformService implements PlatformServiceInterface {
         ),
         shareReplay(1)
       )
+
     return this.thesauri[uri]
   }
+
+  getUserFeedbacks(uuid: string): Observable<UserFeedback[]> {
+    return this.userfeedbackApiService.getUserComments(uuid).pipe(
+      map((userFeedbacks) =>
+        userFeedbacks.map(this.mapper.userFeedbacksFromApi)
+      ),
+      catchError((error) => {
+        console.error('Error fetching user feedbacks:', error)
+        return of(undefined)
+      })
+    )
+  }
+
+  postUserFeedbacks(userFeedback: UserFeedback): Observable<void> {
+    const mappedUserFeedBack = this.mapper.userFeedbacksToApi(userFeedback)
+    return this.userfeedbackApiService.newUserFeedback(mappedUserFeedBack).pipe(
+      map(() => undefined),
+      catchError((error) => {
+        console.error('Error posting user feedback:', error)
+        return of(undefined)
+      })
+    )
+  }
 }

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

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

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

@@ -169,12 +169,12 @@ export interface DatasetSpatialExtent {
 }
 
 /**
- * At least a start or an end date should be provided
+ * Period if both start and end are provided
+ * Instant if only start is provided
  */
 export interface DatasetTemporalExtent {
-  start?: Date
+  start: Date
   end?: Date
-  description?: string
 }
 
 export interface DatasetRecord extends BaseRecord {

package/src/libs/common/domain/src/lib/model/record/user-feedbacks.model.ts

@@ -0,0 +1,15 @@
+export interface UserFeedback {
+  uuid: string
+  comment: string
+  metadataUUID: string
+  authorUserId: string
+  authorName: string
+  authorEmail: string
+  published: boolean
+  parentUuid?: string
+  date: Date
+}
+
+export interface UserFeedbackViewModel extends UserFeedback {
+  avatarUrl: string
+}

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

@@ -2,6 +2,7 @@ import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
 import type { ThesaurusModel } from './model/thesaurus/'
+import { UserFeedback } from './model/record'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -16,4 +17,6 @@ export abstract class PlatformServiceInterface {
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
   abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
+  abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
+  abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 }