geonetwork-ui 2.4.0-dev.db93b4c4 → 2.4.0-dev.dcc96ff9

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -1,4 +1,11 @@
-<div class="flex flex-col h-full">
+<ng-container *ngIf="model === 'licenses'">
+  <gn-ui-form-field-open-data
+    [value]="valueAsConstraints"
+    (valueChange)="valueChange.emit($event)"
+    (openDataChange)="isHidden = $event"
+  ></gn-ui-form-field-open-data>
+</ng-container>
+<div class="flex flex-col h-full" *ngIf="!isHidden">
   <ng-container *ngIf="withoutWrapper; else withGenericWrapper">
     <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
   </ng-container>
@@ -13,72 +20,108 @@
 </div>
 
 <ng-template #fieldContent>
-  <ng-container *ngIf="isTitle">
-    <div class="flex justify-between items-center gap-3">
-      <span
-        #titleInput
-        class="grow font-title text-3xl font-normal"
-        [gnUiEditableLabel]="true"
-        (editableLabelChanged)="formControl.setValue($event)"
-      >
-        {{ formControl.value }}
-      </span>
-      <span
-        class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
-        (click)="focusTitleInput()"
-        >edit</span
-      >
-      <span
-        class="material-symbols-outlined gn-ui-icon-small m-2"
-        [matTooltip]="config.hintKey! | translate"
-        matTooltipPosition="above"
-      >
-        help
-      </span>
-    </div>
-  </ng-container>
-  <ng-container *ngIf="isAbstract">
-    <gn-ui-form-field-rich
-      class="h-[8rem]"
-      [control]="formControl"
-      [label]="config.labelKey! | translate"
-      [hint]="config.hintKey! | translate"
-    ></gn-ui-form-field-rich>
-  </ng-container>
-  <ng-container *ngIf="isLicenses">
-    <gn-ui-form-field-license
-      [control]="formControl"
-      [label]="config.labelKey! | translate"
-    ></gn-ui-form-field-license>
-  </ng-container>
-  <ng-container *ngIf="isResourceUpdated">
-    <gn-ui-form-field-resource-updated
-      [control]="formControl"
-    ></gn-ui-form-field-resource-updated>
-  </ng-container>
-  <ng-container *ngIf="isUpdateFrequency">
-    <gn-ui-form-field-update-frequency
-      [control]="formControl"
-    ></gn-ui-form-field-update-frequency>
-  </ng-container>
-  <ng-container *ngIf="isTemporalExtents">
-    <gn-ui-form-field-temporal-extents
-      [control]="formControl"
-    ></gn-ui-form-field-temporal-extents>
-  </ng-container>
-  <ng-container *ngIf="isSimpleField">
-    <gn-ui-form-field-simple
-      type="text"
-      [control]="formControl"
-      [readonly]="isReadOnly"
-    ></gn-ui-form-field-simple>
-  </ng-container>
-  <ng-container *ngIf="isSpatialExtentField">
-    <gn-ui-form-field-spatial-extent></gn-ui-form-field-spatial-extent>
-  </ng-container>
-  <ng-container *ngIf="isKeywords">
-    <gn-ui-form-field-keywords
-      [control]="formControl"
-    ></gn-ui-form-field-keywords>
+  <ng-container [ngSwitch]="model">
+    <ng-container *ngSwitchCase="'title'">
+      <div class="flex justify-between items-center gap-3">
+        <span
+          #titleInput
+          class="grow font-title text-3xl font-normal"
+          [gnUiEditableLabel]="valueAsString"
+          (editableLabelChanged)="valueChange.emit($event)"
+        ></span>
+        <span
+          class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
+          (click)="focusTitleInput()"
+          >edit</span
+        >
+        <span
+          class="material-symbols-outlined gn-ui-icon-small m-2"
+          [matTooltip]="config.hintKey! | translate"
+          matTooltipPosition="above"
+        >
+          help
+        </span>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'abstract'">
+      <gn-ui-form-field-rich
+        class="h-[8rem]"
+        [label]="config.labelKey! | translate"
+        [hint]="config.hintKey! | translate"
+        [value]="valueAsString"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-rich>
+    </ng-container>
+    <ng-container *ngSwitchCase="'overviews'">
+      <gn-ui-form-field-overviews
+        [metadataUuid]="uniqueIdentifier"
+        [value]="valueAsOverviews"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-overviews>
+    </ng-container>
+    <ng-container *ngSwitchCase="'uniqueIdentifier'">
+      <gn-ui-form-field-simple
+        type="text"
+        [readonly]="true"
+        [value]="valueAsString"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-simple>
+    </ng-container>
+    <ng-container *ngSwitchCase="'resourceUpdated'">
+      <gn-ui-form-field-resource-updated
+        [value]="valueAsDate"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-resource-updated>
+    </ng-container>
+    <ng-container *ngSwitchCase="'recordUpdated'">
+      <gn-ui-form-field-simple
+        type="date"
+        [readonly]="true"
+        [value]="valueAsDate"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-simple>
+    </ng-container>
+    <ng-container *ngSwitchCase="'updateFrequency'">
+      <gn-ui-form-field-update-frequency
+        [value]="valueAsUpdateFrequency"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-update-frequency>
+    </ng-container>
+    <ng-container *ngSwitchCase="'temporalExtents'">
+      <gn-ui-form-field-temporal-extents
+        [value]="valueAsTemporalExtents"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-temporal-extents>
+    </ng-container>
+    <ng-container *ngSwitchCase="'spatialExtents'">
+      <gn-ui-form-field-spatial-extent></gn-ui-form-field-spatial-extent>
+    </ng-container>
+    <ng-container *ngSwitchCase="'keywords'">
+      <gn-ui-form-field-keywords
+        [value]="valueAsKeywords"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-keywords>
+    </ng-container>
+    <ng-container *ngSwitchCase="'licenses'">
+      <gn-ui-form-field-license
+        [label]="config.labelKey! | translate"
+        [value]="valueAsConstraints"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-license>
+    </ng-container>
+    <ng-container *ngSwitchCase="'contactsForResource'">
+      <gn-ui-form-field-contacts-for-resource
+        [value]="valueAsIndividuals"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-contacts-for-resource>
+    </ng-container>
+    <ng-container *ngSwitchCase="'onlineResources'">
+      <gn-ui-form-field-online-link-resources
+        *ngIf="modelSpecifier === 'onlineResourceType:link'"
+        [metadataUuid]="uniqueIdentifier"
+        [value]="valueAsOnlineResources"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-online-link-resources>
+    </ng-container>
   </ng-container>
 </ng-template>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.ts

@@ -3,32 +3,44 @@ import {
   ChangeDetectionStrategy,
   Component,
   ElementRef,
+  EventEmitter,
   Input,
   Output,
   ViewChild,
 } from '@angular/core'
-import { FormControl, ReactiveFormsModule } from '@angular/forms'
 import { MatIconModule } from '@angular/material/icon'
 import { MatTooltipModule } from '@angular/material/tooltip'
+import {
+  CatalogRecordKeys,
+  Constraint,
+  DatasetTemporalExtent,
+  GraphicOverview,
+  Individual,
+  Keyword,
+  OnlineResource,
+  UpdateFrequency,
+} from '../../../../../../../../libs/common/domain/src/lib/model/record'
 import { EditableLabelDirective } from '../../../../../../../../libs/ui/inputs/src'
 import { FormFieldWrapperComponent } from '../../../../../../../../libs/ui/layout/src'
 import { TranslateModule } from '@ngx-translate/core'
-import { Observable } from 'rxjs'
 import {
   FormFieldLicenseComponent,
   FormFieldResourceUpdatedComponent,
   FormFieldTemporalExtentsComponent,
 } from '.'
+import { FieldModelSpecifier, FormFieldConfig } from '../../../models'
 import { FormFieldArrayComponent } from './form-field-array/form-field-array.component'
+import { FormFieldContactsForResourceComponent } from './form-field-contacts-for-resource/form-field-contacts-for-resource.component'
 import { FormFieldFileComponent } from './form-field-file/form-field-file.component'
+import { FormFieldKeywordsComponent } from './form-field-keywords/form-field-keywords.component'
 import { FormFieldObjectComponent } from './form-field-object/form-field-object.component'
+import { FormFieldOverviewsComponent } from './form-field-overviews/form-field-overviews.component'
 import { FormFieldRichComponent } from './form-field-rich/form-field-rich.component'
 import { FormFieldSimpleComponent } from './form-field-simple/form-field-simple.component'
 import { FormFieldSpatialExtentComponent } from './form-field-spatial-extent/form-field-spatial-extent.component'
 import { FormFieldUpdateFrequencyComponent } from './form-field-update-frequency/form-field-update-frequency.component'
-import { CatalogRecordKeys } from '../../../../../../../../libs/common/domain/src/lib/model/record'
-import { FormFieldKeywordsComponent } from './form-field-keywords/form-field-keywords.component'
-import { FormFieldConfig } from '../../../models'
+import { FormFieldOpenDataComponent } from './form-field-open-data/form-field-open-data.component'
+import { FormFieldOnlineLinkResourcesComponent } from './form-field-online-link-resources/form-field-online-link-resources.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -38,7 +50,7 @@ import { FormFieldConfig } from '../../../models'
   standalone: true,
   imports: [
     CommonModule,
-    ReactiveFormsModule,
+    TranslateModule,
     EditableLabelDirective,
     MatIconModule,
     MatTooltipModule,
@@ -54,64 +66,59 @@ import { FormFieldConfig } from '../../../models'
     FormFieldFileComponent,
     FormFieldArrayComponent,
     FormFieldKeywordsComponent,
-    TranslateModule,
+    FormFieldOverviewsComponent,
+    FormFieldContactsForResourceComponent,
+    FormFieldOpenDataComponent,
+    FormFieldOnlineLinkResourcesComponent,
   ],
 })
 export class FormFieldComponent {
+  @Input() uniqueIdentifier: string
   @Input() model: CatalogRecordKeys
+  @Input() modelSpecifier: FieldModelSpecifier
   @Input() config: FormFieldConfig
-  @Input() set value(v: unknown) {
-    this.formControl.setValue(v, {
-      emitEvent: false,
-    })
-  }
+  @Input() value: unknown
 
-  @Output() valueChange: Observable<unknown>
+  @Output() valueChange: EventEmitter<unknown> = new EventEmitter()
 
   @ViewChild('titleInput') titleInput: ElementRef
 
-  formControl = new FormControl()
-
-  constructor() {
-    this.valueChange = this.formControl.valueChanges
-  }
+  isHidden = false
 
   focusTitleInput() {
     this.titleInput.nativeElement.children[0].focus()
   }
 
-  get isTitle() {
-    return this.model === 'title'
-  }
-  get isAbstract() {
-    return this.model === 'abstract'
+  get withoutWrapper() {
+    return this.model === 'title' || this.model === 'abstract'
   }
-  get isLicenses() {
-    return this.model === 'licenses'
+
+  get valueAsString() {
+    return this.value as string
   }
-  get isResourceUpdated() {
-    return this.model === 'resourceUpdated'
+  get valueAsDate() {
+    return this.value as Date
   }
-  get isUpdateFrequency() {
-    return this.model === 'updateFrequency'
+
+  get valueAsOverviews() {
+    return this.value as Array<GraphicOverview>
   }
-  get isTemporalExtents() {
-    return this.model === 'temporalExtents'
+  get valueAsUpdateFrequency() {
+    return this.value as UpdateFrequency
   }
-  get isSpatialExtentField() {
-    return this.model === 'spatialExtents'
+  get valueAsTemporalExtents() {
+    return this.value as Array<DatasetTemporalExtent>
   }
-  get isSimpleField() {
-    return this.model === 'uniqueIdentifier' || this.model === 'recordUpdated'
+  get valueAsKeywords() {
+    return this.value as Array<Keyword>
   }
-  get isReadOnly() {
-    return this.model === 'uniqueIdentifier' || this.model === 'recordUpdated'
+  get valueAsConstraints() {
+    return this.value as Array<Constraint>
   }
-  get isKeywords() {
-    return this.model === 'keywords'
+  get valueAsIndividuals() {
+    return this.value as Array<Individual>
   }
-
-  get withoutWrapper() {
-    return this.model === 'title' || this.model === 'abstract'
+  get valueAsOnlineResources() {
+    return this.value as Array<OnlineResource>
   }
 }

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.html

@@ -14,7 +14,7 @@
           >
             <div
               *ngIf="section.labelKey"
-              class="text-2xl font-petrona text-secondary"
+              class="text-2xl font-title text-secondary"
               translate
             >
               {{ section.labelKey }}
@@ -35,7 +35,9 @@
           >
             <ng-container *ngIf="!field.config.hidden">
               <gn-ui-form-field
+                [uniqueIdentifier]="recordUniqueIdentifier$ | async"
                 [model]="field.config.model!"
+                [modelSpecifier]="field.config.modelSpecifier!"
                 [config]="field.config.formFieldConfig"
                 [value]="field.value"
                 (valueChange)="

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.ts

@@ -8,6 +8,8 @@ import {
   EditorFieldWithValue,
   EditorSectionWithValues,
 } from '../../+state/editor.models'
+import { map } from 'rxjs'
+import { CatalogRecordKeys } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-record-form',
@@ -18,20 +20,24 @@ import {
   imports: [CommonModule, FormFieldComponent, TranslateModule],
 })
 export class RecordFormComponent {
+  recordUniqueIdentifier$ = this.facade.record$.pipe(
+    map((record) => record.uniqueIdentifier)
+  )
+
   constructor(public facade: EditorFacade) {}
 
-  handleFieldValueChange(model: string, newValue: EditorFieldValue) {
+  handleFieldValueChange(model: CatalogRecordKeys, newValue: EditorFieldValue) {
     if (!model) {
       return
     }
     this.facade.updateRecordField(model, newValue)
   }
 
-  fieldTracker(index: number, field: EditorFieldWithValue): any {
+  fieldTracker(index: number, field: EditorFieldWithValue) {
     return field.config.model
   }
 
-  sectionTracker(index: number, section: EditorSectionWithValues): any {
+  sectionTracker(index: number, section: EditorSectionWithValues) {
     return section.labelKey
   }
 }

package/src/libs/feature/editor/src/lib/components/wizard-field/wizard-field.component.html

@@ -13,7 +13,7 @@
         [id]="wizardFieldConfig.id"
         [value]="wizardFieldData"
         [required]="wizardFieldConfig.required || false"
-        hint=""
+        placeholder=""
       ></gn-ui-text-input>
     </div>
     <div

package/src/libs/feature/editor/src/lib/feature-editor.module.ts

@@ -4,7 +4,7 @@ import { NgModule } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatFormFieldModule } from '@angular/material/form-field'
-import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
+import { TextInputComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { EffectsModule } from '@ngrx/effects'
 import { StoreModule } from '@ngrx/store'
@@ -38,6 +38,7 @@ import { Gn4PlatformService } from '../../../../../libs/api/repository/src'
       fromEditor.editorReducer
     ),
     EffectsModule.forFeature([EditorEffects]),
+    TextInputComponent,
   ],
   exports: [WizardComponent, WizardSummarizeComponent],
   providers: [EditorFacade, Gn4PlatformService],

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

@@ -4,6 +4,7 @@ import {
   EditorField,
   EditorSection,
 } from './models/editor-config.model'
+import { Keyword } from '../../../../../libs/common/domain/src/lib/model/record'
 
 /**
  * This file contains the configuration of the fields that will be displayed in the editor.
@@ -83,6 +84,35 @@ export const RECORD_ABSTRACT_FIELD: EditorField = {
   },
 }
 
+export const CONTACTS_FOR_RESOURCE_FIELD: EditorField = {
+  model: 'contactsForResource',
+  formFieldConfig: {
+    labelKey: '',
+  },
+}
+
+export const RECORD_GRAPHICAL_OVERVIEW_FIELD: EditorField = {
+  model: 'overviews',
+  formFieldConfig: {
+    labelKey: marker('editor.record.form.field.overviews'),
+  },
+}
+
+export const RECORD_SPATIAL_EXTENTS_FIELD: EditorField = {
+  model: 'spatialExtents',
+  formFieldConfig: {
+    labelKey: marker('editor.record.form.field.spatialExtents'),
+  },
+}
+
+export const RECORD_ONLINE_LINK_RESOURCES: EditorField = {
+  model: 'onlineResources',
+  modelSpecifier: 'onlineResourceType:link',
+  formFieldConfig: {
+    labelKey: marker('editor.record.form.field.onlineLinkResources'),
+  },
+}
+
 /************************************************************
  ***************          SECTIONS          *****************
  ************************************************************
@@ -90,7 +120,11 @@ export const RECORD_ABSTRACT_FIELD: EditorField = {
 
 export const TITLE_SECTION: EditorSection = {
   hidden: false,
-  fields: [RECORD_TITLE_FIELD, RECORD_ABSTRACT_FIELD],
+  fields: [
+    RECORD_TITLE_FIELD,
+    RECORD_ABSTRACT_FIELD,
+    RECORD_GRAPHICAL_OVERVIEW_FIELD,
+  ],
 }
 
 export const ABOUT_SECTION: EditorSection = {
@@ -109,7 +143,7 @@ export const ABOUT_SECTION: EditorSection = {
 export const GEOGRAPHICAL_COVERAGE_SECTION: EditorSection = {
   labelKey: marker('editor.record.form.section.geographicalCoverage.label'),
   hidden: false,
-  fields: [],
+  fields: [RECORD_SPATIAL_EXTENTS_FIELD],
 }
 
 export const ASSOCIATED_RESOURCES_SECTION: EditorSection = {
@@ -124,7 +158,7 @@ export const ASSOCIATED_RESOURCES_SECTION: EditorSection = {
 export const ANNEXES_SECTION: EditorSection = {
   labelKey: marker('editor.record.form.section.annexes.label'),
   hidden: false,
-  fields: [],
+  fields: [RECORD_ONLINE_LINK_RESOURCES],
 }
 
 export const CLASSIFICATION_SECTION: EditorSection = {
@@ -146,7 +180,7 @@ 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: [],
+  fields: [CONTACTS_FOR_RESOURCE_FIELD],
 }
 
 export const DATA_POINT_OF_CONTACT_SECTION: EditorSection = {
@@ -183,3 +217,36 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
     },
   ],
 }
+
+/************************************************************
+ ***************           LICENSES            **************
+ ************************************************************
+ */
+export const OPEN_DATA_LICENSES: string[] = [
+  'etalab',
+  'etalab-v2',
+  'odbl',
+  'odc-by',
+  'pddl',
+]
+
+export const MAX_UPLOAD_SIZE_MB = 10
+/************************************************************
+ ***************        SPATIAL SCOPE            ************
+ ************************************************************
+ */
+
+export const SPATIAL_SCOPES: Keyword[] = [
+  {
+    key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/national',
+    label: 'National',
+    description: '',
+    type: 'theme',
+  },
+  {
+    key: 'http://inspire.ec.europa.eu/metadata-codelist/SpatialScope/regional',
+    label: 'Regional',
+    description: '',
+    type: 'theme',
+  },
+]

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

@@ -16,12 +16,21 @@ export interface FormFieldConfig {
   invalidHintKey?: string
 }
 
+// Specifiers let us use specific components
+// This is used for instance to target only certain online resources in a field
+type OnlineLinkResourceSpecifier = `onlineResourceType:link`
+type DatasetDistributionsSpecifier = `onlineResourceType:!link`
+export type FieldModelSpecifier =
+  | OnlineLinkResourceSpecifier
+  | DatasetDistributionsSpecifier
+
 export interface EditorField {
   // configuration of the form field used as presentation
   formFieldConfig: FormFieldConfig
 
   // name of the target field in the record; will not change the record directly if not defined
   model?: CatalogRecordKeys
+  modelSpecifier?: FieldModelSpecifier
 
   // 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

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

@@ -59,4 +59,11 @@ export class EditorService {
       .saveRecordAsDraft(record)
       .pipe(map(() => undefined))
   }
+
+  undoRecordDraft(
+    record: CatalogRecord
+  ): Observable<[CatalogRecord, string, boolean]> {
+    this.recordsRepository.clearRecordDraft(record.uniqueIdentifier)
+    return this.recordsRepository.openRecordForEdition(record.uniqueIdentifier)
+  }
 }

package/src/libs/feature/map/src/lib/add-layer-from-catalog/add-layer-from-catalog.component.ts

@@ -1,5 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
 import {
+  FeatureSearchModule,
   FIELDS_BRIEF,
   SearchFacade,
   SearchService,
@@ -15,6 +16,7 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
   templateUrl: './add-layer-from-catalog.component.html',
   styleUrls: ['./add-layer-from-catalog.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
   providers: [
     SearchFacade,
     SearchService,
@@ -30,6 +32,7 @@ import { AddLayerRecordPreviewComponent } from './add-layer-record-preview/add-l
       },
     },
   ],
+  imports: [FeatureSearchModule],
 })
 export class AddLayerFromCatalogComponent implements OnInit {
   constructor(private searchFacade: SearchFacade) {}