geonetwork-ui 2.10.0-dev.de2fa8e42 → 2.10.0-dev.e7b9cb6a0

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

@@ -254,10 +254,20 @@ export interface DatasetTemporalExtent {
   end?: Date
 }
 
+/**
+ * Represents a source dataset referenced from a lineage entry.
+ */
+export interface SourceRecord {
+  uuid?: string
+  title?: string
+  href?: string
+}
+
 export interface DatasetRecord extends BaseRecord {
   kind: 'dataset'
   status: RecordStatus
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  sourceRecords: Array<SourceRecord>
   onlineResources: Array<DatasetOnlineResource>
   spatialExtents: Array<DatasetSpatialExtent>
   temporalExtents: Array<DatasetTemporalExtent>
@@ -285,6 +295,7 @@ export interface ServiceRecord extends BaseRecord {
 export interface ReuseRecord extends BaseRecord {
   kind: 'reuse'
   lineage: string // Explanation of the origin of this record (e.g: how, why)"
+  sourceRecords: Array<SourceRecord>
   onlineResources: Array<DatasetOnlineResource>
   reuseType: ReuseType
   spatialExtents: Array<DatasetSpatialExtent>

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

@@ -0,0 +1,8 @@
+export interface GroupModel {
+  groupId: number
+  groupName: string
+  isMember: boolean
+  canEdit: boolean
+  canApprove: boolean
+  canAdministrate: boolean
+}

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

@@ -1 +1,2 @@
 export * from './user.model'
+export * from './group.model'

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

@@ -1,5 +1,6 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
+import type { GroupModel } from './model/user/group.model'
 import type { Organization } from './model/record/organization.model'
 import { CatalogRecord, Keyword, UserFeedback } from './model/record'
 import { KeywordType } from './model/thesaurus'
@@ -28,6 +29,7 @@ export abstract class PlatformServiceInterface {
   abstract getMe(): Observable<UserModel>
   abstract isAnonymous(): Observable<boolean>
   abstract getUsers(): Observable<UserModel[]>
+  abstract getUserPermissionsByGroup(): Observable<GroupModel[]>
   abstract getUsersByOrganization(
     organisation: Organization
   ): Observable<UserModel[]>

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

@@ -134,6 +134,7 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
     lineage: `This record was edited manually to test the conversion processes
 
 As such, **it is not very interesting at all.**`,
+    sourceRecords: [],
     licenses: [
       {
         text: 'Licence ODbL mai 2013 (basée sur ODbL 1.0)',
@@ -310,6 +311,7 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
+    sourceRecords: [],
     legalConstraints: [],
     securityConstraints: [],
     otherConstraints: [],
@@ -361,6 +363,7 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [
     {
       type: 'download',
@@ -413,6 +416,7 @@ export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
   overviews: [],
   spatialExtents: [],
   temporalExtents: [],
+  sourceRecords: [],
   onlineResources: [],
   updateFrequency: { per: 'month', updatedTimes: 3 },
   translations: {},
@@ -978,6 +982,7 @@ export const multilingualDatasetFixture: () => DatasetRecord = () => ({
   title: 'English Title',
   abstract: 'English Abstract',
   lineage: 'English Lineage',
+  sourceRecords: [],
   translations: {
     title: { fr: 'Titre Français', de: 'Titel DE' },
     abstract: { fr: 'Résumé Français', de: 'Beschreibung DE' },

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, inject } from '@angular/core'
-import { forkJoin, Observable, of, switchMap } from 'rxjs'
+import { Observable, switchMap } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { EditorConfig } from '../models/'

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -2,6 +2,7 @@ import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
   checkNewRecordDefaultLanguage,
+  checkNewRecordStandard,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -297,7 +298,7 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
         parsed,
         'editing',
         [],
-        ['new_record_default_language'],
+        ['new_record_default_language', 'new_record_standard'],
         warnings,
         errors
       )
@@ -310,6 +311,15 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
           warnings
         )
       }
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_standard !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordStandard(
+          parsedEditingSection,
+          warnings
+        )
+      }
       editorConfig =
         parsedEditingSection === null
           ? null
@@ -318,6 +328,9 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
                 parsedEditingSection.new_record_default_language as
                   | string
                   | undefined,
+              NEW_RECORD_STANDARD: parsedEditingSection.new_record_standard as
+                | EditorConfig['NEW_RECORD_STANDARD']
+                | undefined,
             } as EditorConfig)
 
       customTranslations = parseTranslationsConfigSection(

package/src/libs/util/app-config/src/lib/model.ts

@@ -69,8 +69,11 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export type NewRecordStandard = 'iso19139' | 'iso19115-3'
+
 export interface EditorConfig {
   NEW_RECORD_DEFAULT_LANGUAGE?: string
+  NEW_RECORD_STANDARD?: NewRecordStandard
 }
 
 export type CustomTranslations = { [translationKey: string]: string }

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -159,3 +159,30 @@ export function checkNewRecordDefaultLanguage(
     new_record_default_language: lang2,
   }
 }
+
+export function checkNewRecordStandard(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const standard = parsedConfigSection.new_record_standard
+  const normalizedStandard =
+    typeof standard === 'string' ? standard.trim().toLowerCase() : null
+
+  if (
+    normalizedStandard === 'iso19139' ||
+    normalizedStandard === 'iso19115-3'
+  ) {
+    return {
+      ...parsedConfigSection,
+      new_record_standard: normalizedStandard,
+    }
+  }
+
+  outWarnings.push(
+    `In the [editing] section: new_record_standard = "${standard}" is not a supported metadata standard`
+  )
+  return {
+    ...parsedConfigSection,
+    new_record_standard: undefined,
+  }
+}

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -266,7 +266,7 @@ export function checkFileFormat(
       new RegExp(`[./]${format}`, 'i').test(link.name.toLowerCase())) ||
     ('url' in link &&
       new RegExp(`[./]${format}`, 'i').test(link.url.toString())) ||
-    ('name' in link && link.name.toLowerCase().includes(format))
+    ('name' in link && new RegExp(`\\b${format}\\b`, 'i').test(link.name))
   )
 }