geonetwork-ui 2.10.0-dev.b6696be21 → 2.10.0-dev.bf2e85a24

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -1,9 +1,5 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-import {
-  EditorConfig,
-  EditorField,
-  EditorSection,
-} from './models/editor-config.model'
+import { EditorConfig } from './models/editor-config.model'
 import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
 
 export interface ISOTopic {
@@ -13,308 +9,282 @@ export interface ISOTopic {
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
- * To add a new field, you need to create a new EditorField object in the fields part of this file.
- * Then add it to the corresponding section in the sections part of this file.
- * Finally, add the section to the corresponding page in the pages part of this file.
  */
 
-/************************************************************
- ***************           FIELDS           *****************
- ************************************************************
- */
-
-export const RECORD_UNIQUE_IDENTIFIER_FIELD: EditorField = {
-  model: 'uniqueIdentifier',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.uniqueIdentifier'),
-  },
-  hidden: true,
-}
-
-export const CONSTRAINTS_SHORTCUTS: EditorField = {
-  componentName: 'form-field-constraints-shortcuts',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.constraintsShortcuts'),
-  },
-}
-
-export const LEGAL_CONSTRAINTS_FIELD: EditorField = {
-  model: 'legalConstraints',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.legalConstraints'),
-  },
-}
-export const SECURITY_CONSTRAINTS_FIELD: EditorField = {
-  model: 'securityConstraints',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.securityConstraints'),
-  },
-}
-export const OTHER_CONSTRAINTS_FIELD: EditorField = {
-  model: 'otherConstraints',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.otherConstraints'),
-  },
-}
-
-export const RECORD_LICENSE_FIELD: EditorField = {
-  model: 'licenses',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.license'),
-  },
-}
-
-export const RECORD_KEYWORDS_FIELD: EditorField = {
-  model: 'keywords',
-  formFieldConfig: {},
-}
-
-export const RECORD_TOPICS_FIELD: EditorField = {
-  model: 'topics',
-  formFieldConfig: {},
-}
-
-export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
-  model: 'resourceCreated',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.resourceCreated'),
-  },
-  gridColumnSpan: 1,
-}
-
-export const RESOURCE_IDENTIFIER_FIELD: EditorField = {
-  model: 'resourceIdentifiers',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.resourceIdentifier'),
-  },
-}
-
-export const RECORD_RESOURCE_UPDATED_FIELD: EditorField = {
-  model: 'resourceUpdated',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.resourceUpdated'),
-  },
-  gridColumnSpan: 1,
-}
-
-export const RECORD_UPDATED_FIELD: EditorField = {
-  model: 'recordUpdated',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.recordUpdated'),
-  },
-  onSaveProcess: '${dateNow()}',
-  gridColumnSpan: 1,
-  hidden: true,
-}
-
-export const RECORD_UPDATE_FREQUENCY_FIELD: EditorField = {
-  model: 'updateFrequency',
-  formFieldConfig: {},
-}
-// keeping track of the label to not lose existing translation
+// keeping track of labels to not lose existing translations
 marker('editor.record.form.field.updateFrequency')
-
-export const RECORD_TEMPORAL_EXTENTS_FIELD: EditorField = {
-  model: 'temporalExtents',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.temporalExtents'),
-  },
-}
-
-export const RECORD_TITLE_FIELD: EditorField = {
-  model: 'title',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.title'),
-  },
-}
-
-export const RECORD_ABSTRACT_FIELD: EditorField = {
-  model: 'abstract',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.abstract'),
-  },
-}
-
-export const CONTACTS_FOR_RESOURCE_FIELD: EditorField = {
-  model: 'contactsForResource',
-  formFieldConfig: {
-    labelKey: '',
-  },
-}
-
-export const CONTACTS: EditorField = {
-  model: 'contacts',
-  formFieldConfig: {
-    labelKey: '',
-  },
-}
-
-export const RECORD_GRAPHICAL_OVERVIEW_FIELD: EditorField = {
-  model: 'overviews',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.overviews'),
-  },
-}
-
-export const RECORD_SPATIAL_TOGGLE_FIELD: EditorField = {
-  componentName: 'form-field-spatial-toggle',
-  formFieldConfig: {},
-  hidden: true,
-}
-
-export const RECORD_SPATIAL_EXTENTS_FIELD: EditorField = {
-  model: 'spatialExtents',
-  formFieldConfig: {},
-}
-// keeping track of the label to not lose existing translation
 marker('editor.record.form.field.spatialExtents')
-
-export const RECORD_ONLINE_RESOURCES: EditorField = {
-  model: 'onlineResources',
-  modelSpecifier: 'onlineResourceType:!link',
-  formFieldConfig: {},
-}
-// keeping track of the label to not lose existing translation
 marker('editor.record.form.field.onlineResources')
-
-export const RECORD_ONLINE_LINK_RESOURCES: EditorField = {
-  model: 'onlineResources',
-  modelSpecifier: 'onlineResourceType:link',
-  formFieldConfig: {},
-}
-// keeping track of the label to not lose existing translation
 marker('editor.record.form.field.onlineLinkResources')
 
-/************************************************************
- ***************          SECTIONS          *****************
- ************************************************************
- */
-
-export const TITLE_SECTION: EditorSection = {
-  hidden: false,
-  fields: [
-    RECORD_TITLE_FIELD,
-    RECORD_ABSTRACT_FIELD,
-    RECORD_GRAPHICAL_OVERVIEW_FIELD,
-  ],
-}
-
-export const ABOUT_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.about.label'),
-  descriptionKey: marker('editor.record.form.section.about.description'),
-  hidden: false,
-  fields: [
-    RECORD_UNIQUE_IDENTIFIER_FIELD,
-    RESOURCE_IDENTIFIER_FIELD,
-    RECORD_RESOURCE_CREATED_FIELD,
-    RECORD_RESOURCE_UPDATED_FIELD,
-    RECORD_UPDATED_FIELD,
-    RECORD_UPDATE_FREQUENCY_FIELD,
-    RECORD_TEMPORAL_EXTENTS_FIELD,
-  ],
-}
-
-export const GEOGRAPHICAL_COVERAGE_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.geographicalCoverage.label'),
-  hidden: false,
-  fields: [RECORD_SPATIAL_TOGGLE_FIELD, RECORD_SPATIAL_EXTENTS_FIELD],
-}
-
-export const ASSOCIATED_RESOURCES_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.associatedResources.label'),
-  descriptionKey: marker(
-    'editor.record.form.section.associatedResources.description'
-  ),
-  hidden: false,
-  fields: [RECORD_ONLINE_RESOURCES],
-}
-
-export const ANNEXES_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.annexes.label'),
-  descriptionKey: marker('editor.record.form.section.annexes.description'),
-  hidden: false,
-  fields: [RECORD_ONLINE_LINK_RESOURCES],
-}
-
-export const CLASSIFICATION_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.classification.label'),
-  descriptionKey: marker(
-    'editor.record.form.section.classification.description'
-  ),
-  hidden: false,
-  fields: [RECORD_KEYWORDS_FIELD],
-}
-
-export const TOPICS_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.topics.label'),
-  descriptionKey: marker('editor.record.form.section.topics.description'),
-  hidden: false,
-  fields: [RECORD_TOPICS_FIELD],
-}
-
-export const USE_AND_ACCESS_CONDITIONS_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.useAndAccessConditions.label'),
-  hidden: false,
-  fields: [
-    RECORD_LICENSE_FIELD,
-    CONSTRAINTS_SHORTCUTS,
-    LEGAL_CONSTRAINTS_FIELD,
-    SECURITY_CONSTRAINTS_FIELD,
-    OTHER_CONSTRAINTS_FIELD,
-  ],
-}
-
-export const DATA_MANAGERS_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.dataManagers.label'),
-  descriptionKey: marker('editor.record.form.section.dataManagers.description'),
-  hidden: false,
-  fields: [CONTACTS_FOR_RESOURCE_FIELD],
-}
-
-export const METADATA_POINT_OF_CONTACT_SECTION: EditorSection = {
-  labelKey: marker('editor.record.form.section.metadataPointOfContact.label'),
-  descriptionKey: marker(
-    'editor.record.form.section.metadataPointOfContact.description'
-  ),
-  hidden: false,
-  fields: [CONTACTS],
-}
-
-/************************************************************
- ***************           PAGES            *****************
- ************************************************************
- */
 export const DEFAULT_CONFIGURATION: EditorConfig = {
   pages: [
+    /**
+     * Page 1: DESCRIPTION
+     */
+
     {
       labelKey: marker('editor.record.form.page.description'),
       sections: [
-        TITLE_SECTION,
-        CLASSIFICATION_SECTION,
-        TOPICS_SECTION,
-        ABOUT_SECTION,
-        GEOGRAPHICAL_COVERAGE_SECTION,
+        // Section: Title, abstract and overview
+        {
+          fields: [
+            {
+              model: 'title',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.title'),
+              },
+            },
+            {
+              model: 'abstract',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.abstract'),
+              },
+            },
+            {
+              model: 'overviews',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.overviews'),
+              },
+            },
+          ],
+        },
+
+        // Section: Classification
+        {
+          labelKey: marker('editor.record.form.section.classification.label'),
+          descriptionKey: marker(
+            'editor.record.form.section.classification.description'
+          ),
+          fields: [
+            {
+              model: 'keywords',
+              formFieldConfig: {},
+            },
+          ],
+        },
+
+        // Section: Topics
+        {
+          labelKey: marker('editor.record.form.section.topics.label'),
+          descriptionKey: marker(
+            'editor.record.form.section.topics.description'
+          ),
+          fields: [
+            {
+              model: 'topics',
+              formFieldConfig: {},
+            },
+          ],
+        },
+
+        // Section: About (identifiers, dates, update frequency, temporal extents)
+        {
+          labelKey: marker('editor.record.form.section.about.label'),
+          descriptionKey: marker(
+            'editor.record.form.section.about.description'
+          ),
+          fields: [
+            {
+              model: 'uniqueIdentifier',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.uniqueIdentifier'),
+              },
+              hidden: true,
+            },
+            {
+              model: 'resourceIdentifiers',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.resourceIdentifier'),
+              },
+            },
+            {
+              model: 'resourceCreated',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.resourceCreated'),
+              },
+              gridColumnSpan: 1,
+            },
+            {
+              model: 'resourceUpdated',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.resourceUpdated'),
+              },
+              gridColumnSpan: 1,
+            },
+            {
+              model: 'recordUpdated',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.recordUpdated'),
+              },
+              onSaveProcess: '${dateNow()}',
+              gridColumnSpan: 1,
+              hidden: true,
+            },
+            {
+              model: 'updateFrequency',
+              formFieldConfig: {},
+            },
+            {
+              model: 'temporalExtents',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.temporalExtents'),
+              },
+              hidden: '${record.kind == "service"}',
+            },
+          ],
+        },
+
+        // Section: Geographical coverage
+        {
+          labelKey: marker(
+            'editor.record.form.section.geographicalCoverage.label'
+          ),
+          fields: [
+            {
+              componentName: 'form-field-spatial-toggle',
+              formFieldConfig: {},
+              hidden: true,
+            },
+            {
+              model: 'spatialExtents',
+              formFieldConfig: {},
+            },
+          ],
+        },
       ],
     },
+
+    /**
+     * Page 2: RESOURCES
+     */
+
     {
       labelKey: marker('editor.record.form.page.resources'),
-      sections: [ASSOCIATED_RESOURCES_SECTION, ANNEXES_SECTION],
+      sections: [
+        // Section: Associated resources (distributions, services, …)
+        {
+          hidden: '${record.kind != "dataset"}',
+          labelKey: marker(
+            'editor.record.form.section.associatedResources.label'
+          ),
+          descriptionKey: marker(
+            'editor.record.form.section.associatedResources.description'
+          ),
+          fields: [
+            {
+              model: 'onlineResources',
+              modelSpecifier: 'onlineResourceType:!link',
+              formFieldConfig: {},
+            },
+          ],
+        },
+
+        // Section: Annexes (links)
+        {
+          labelKey: marker('editor.record.form.section.annexes.label'),
+          descriptionKey: marker(
+            'editor.record.form.section.annexes.description'
+          ),
+          fields: [
+            {
+              model: 'onlineResources',
+              modelSpecifier: 'onlineResourceType:link',
+              formFieldConfig: {},
+            },
+          ],
+        },
+      ],
     },
+
+    /**
+     * Page 3: ACCESS & CONTACT
+     */
+
     {
       labelKey: marker('editor.record.form.page.accessAndContact'),
       sections: [
-        USE_AND_ACCESS_CONDITIONS_SECTION,
-        DATA_MANAGERS_SECTION,
-        METADATA_POINT_OF_CONTACT_SECTION,
+        // Section: Use and access conditions (license, constraints)
+        {
+          labelKey: marker(
+            'editor.record.form.section.useAndAccessConditions.label'
+          ),
+          fields: [
+            {
+              model: 'licenses',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.license'),
+              },
+            },
+            {
+              componentName: 'form-field-constraints-shortcuts',
+              formFieldConfig: {
+                labelKey: marker(
+                  'editor.record.form.field.constraintsShortcuts'
+                ),
+              },
+            },
+            {
+              model: 'legalConstraints',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.legalConstraints'),
+              },
+            },
+            {
+              model: 'securityConstraints',
+              formFieldConfig: {
+                labelKey: marker(
+                  'editor.record.form.field.securityConstraints'
+                ),
+              },
+            },
+            {
+              model: 'otherConstraints',
+              formFieldConfig: {
+                labelKey: marker('editor.record.form.field.otherConstraints'),
+              },
+            },
+          ],
+        },
+
+        // Section: Data managers (contacts for resource)
+        {
+          labelKey: marker('editor.record.form.section.dataManagers.label'),
+          descriptionKey: marker(
+            'editor.record.form.section.dataManagers.description'
+          ),
+          fields: [
+            {
+              model: 'contactsForResource',
+              formFieldConfig: { labelKey: '' },
+            },
+          ],
+        },
+
+        // Section: Metadata point of contact
+        {
+          labelKey: marker(
+            'editor.record.form.section.metadataPointOfContact.label'
+          ),
+          descriptionKey: marker(
+            'editor.record.form.section.metadataPointOfContact.description'
+          ),
+          fields: [
+            {
+              model: 'contacts',
+              formFieldConfig: { labelKey: '' },
+            },
+          ],
+        },
       ],
     },
   ],
 }
 
-/************************************************************
- ***************           LICENSES            **************
- ************************************************************
+/**
+ * OTHER SETTINGS
  */
+
 export const AVAILABLE_LICENSES: string[] = [
   'cc-by',
   'cc-by-sa',
@@ -340,10 +310,6 @@ marker('editor.record.form.license.pddl')
 marker('editor.record.form.license.unknown')
 
 export const MAX_UPLOAD_SIZE_MB = 10
-/************************************************************
- ***************        SPATIAL SCOPE            ************
- ************************************************************
- */
 
 export const SPATIAL_SCOPES: Keyword[] = [
   {
@@ -360,11 +326,6 @@ export const SPATIAL_SCOPES: Keyword[] = [
   },
 ]
 
-/************************************************************
- ***************             ISO TOPICS             **************
- ************************************************************
- */
-
 // label keys mirror the ISO MD_TopicCategoryCode value for consistency
 // TODO: correctly handle code lists; for instance, this code list is specific to ISO 19139
 export const ISO_TOPICS: ISOTopic[] = [

package/src/libs/feature/editor/src/lib/models/editor-config.model.ts

@@ -48,8 +48,7 @@ export interface EditorField extends EditorFieldIdentification {
   gridColumnSpan?: number
 
   // a hidden field won't show but can still be used to modify the record
-  // FIXME: currently this is redundant with an absence of formFieldConfig but necessary for clarity
-  hidden?: boolean
+  hidden?: boolean | EditorFieldExpression
 
   // the result of this expression will replace the field value on save
   onSaveProcess?: EditorFieldExpression
@@ -58,7 +57,7 @@ export interface EditorField extends EditorFieldIdentification {
 export interface EditorSection {
   labelKey?: string
   descriptionKey?: string
-  hidden: boolean
+  hidden?: boolean | EditorFieldExpression
   fields: EditorField[]
 }
 

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

@@ -1,4 +1,4 @@
-import { Injectable, inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { Observable, switchMap } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
@@ -16,7 +16,8 @@ export class EditorService {
   saveRecord(
     record: CatalogRecord,
     recordSource: string,
-    fieldsConfig: EditorConfig
+    fieldsConfig: EditorConfig,
+    publish: boolean
   ): Observable<[CatalogRecord, string]> {
     const savedRecord = { ...record }
 
@@ -27,22 +28,17 @@ export class EditorService {
     // run onSave processes
     for (const field of fields) {
       if (field.onSaveProcess && field.model) {
-        const evaluator = evaluate(field.onSaveProcess)
+        const { evaluator } = evaluate(field.onSaveProcess)
         savedRecord[field.model] = evaluator({
-          model: field.model,
-          value: record[field.model],
+          globals: {
+            record,
+          },
         })
       }
     }
-    let publishToAll = true
-    // if the record is new, generate a new unique identifier and pass publishToAll as false
-    if (!record.uniqueIdentifier) {
-      savedRecord.uniqueIdentifier = null
-      publishToAll = false
-    }
 
     return this.recordsRepository
-      .saveRecord(savedRecord, recordSource, publishToAll)
+      .saveRecord(savedRecord, recordSource, publish)
       .pipe(
         switchMap((uniqueIdentifier) =>
           this.recordsRepository.openRecordForEdition(uniqueIdentifier)

package/src/libs/feature/map/src/lib/utils/map-utils.service.ts

@@ -2,6 +2,23 @@ import { Injectable } from '@angular/core'
 import { extend } from 'ol/extent.js'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BoundingBox, getGeometryBoundingBox } from '../../../../../../libs/util/shared/src'
+import { MapContextLayer } from '@geospatial-sdk/core'
+import {
+  createSpatialExtentLayer,
+  SpatialExtentLayerStyle,
+} from '../../../../../../libs/ui/map/src'
+
+/**
+ * Style of the extent overlay drawn on top of the previewed data: a dashed
+ * black outline over a very light fill, so the extent stays readable without
+ * hiding the data underneath.
+ */
+const RECORD_EXTENT_OVERLAY_STYLE: SpatialExtentLayerStyle = {
+  'stroke-color': 'rgba(0, 0, 0, 0.6)',
+  'stroke-width': 2,
+  'stroke-line-dash': [8, 6],
+  'fill-color': 'rgba(0, 0, 0, 0.03)',
+}
 
 @Injectable({
   providedIn: 'root',
@@ -26,4 +43,20 @@ export class MapUtilsService {
       [Infinity, Infinity, -Infinity, -Infinity]
     )
   }
+
+  /**
+   * Builds a non-interactive overlay layer drawing the spatial extent(s)
+   * declared in the record's metadata (bounding boxes and/or geometries).
+   * Returns null when the record has no usable spatial extent.
+   *
+   * This is purely for display and is independent from the map's initial view,
+   * which is derived separately (see {@link getRecordExtent}).
+   */
+  getRecordExtentLayer(record: Partial<CatalogRecord>): MapContextLayer | null {
+    return createSpatialExtentLayer(record.spatialExtents ?? [], {
+      label: 'Spatial extent',
+      clickable: false,
+      style: RECORD_EXTENT_OVERLAY_STYLE,
+    })
+  }
 }