geonetwork-ui 2.4.0-dev.3c297076 → 2.4.0-dev.4892c308

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,78 +20,114 @@
 </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="isGraphicOverview">
-    <gn-ui-form-field-overviews
-      [control]="formControl"
-      [metadataUuid]="metadataUuid$ | async"
-    ></gn-ui-form-field-overviews>
-  </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 flex-row flex-start items-center gap-3 mb-[12px]">
+        <span
+          #titleInput
+          data-test="recordTitleInput"
+          class="grow font-title text-3xl font-normal"
+          [gnUiEditableLabel]="valueAsString"
+          (editableLabelChanged)="valueChange.emit($event)"
+        ></span>
+        <div class="flex flex-row justify-between">
+          <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>
+      </div>
+    </ng-container>
+    <ng-container *ngSwitchCase="'abstract'">
+      <gn-ui-form-field-rich
+        [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-date-updated
+        [value]="valueAsDate"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-date-updated>
+    </ng-container>
+    <ng-container *ngSwitchCase="'recordUpdated'">
+      <gn-ui-form-field-date-updated
+        [value]="valueAsDate"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-date-updated>
+    </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="'contacts'">
+      <gn-ui-form-field-contacts
+        [value]="valueAsIndividuals"
+        (valueChange)="valueChange.emit($event)"
+      ></gn-ui-form-field-contacts>
+    </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,35 +3,45 @@ 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 {
+  FormFieldDateUpdatedComponent,
   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 { FormFieldOverviewsComponent } from './form-field-overviews/form-field-overviews.component'
-import { map, take } from 'rxjs/operators'
-import { EditorFacade } from '../../../+state/editor.facade'
-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'
+import { FormFieldContactsComponent } from './form-field-contacts/form-field-contacts.component'
 
 @Component({
   selector: 'gn-ui-form-field',
@@ -41,13 +51,13 @@ import { FormFieldConfig } from '../../../models'
   standalone: true,
   imports: [
     CommonModule,
-    ReactiveFormsModule,
+    TranslateModule,
     EditableLabelDirective,
     MatIconModule,
     MatTooltipModule,
     FormFieldWrapperComponent,
     FormFieldLicenseComponent,
-    FormFieldResourceUpdatedComponent,
+    FormFieldDateUpdatedComponent,
     FormFieldUpdateFrequencyComponent,
     FormFieldTemporalExtentsComponent,
     FormFieldSimpleComponent,
@@ -57,73 +67,60 @@ import { FormFieldConfig } from '../../../models'
     FormFieldFileComponent,
     FormFieldArrayComponent,
     FormFieldKeywordsComponent,
-    TranslateModule,
     FormFieldOverviewsComponent,
+    FormFieldContactsForResourceComponent,
+    FormFieldOpenDataComponent,
+    FormFieldOnlineLinkResourcesComponent,
+    FormFieldContactsComponent,
   ],
 })
 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
 
-  metadataUuid$ = this.facade.record$.pipe(
-    take(1),
-    map((record) => record.uniqueIdentifier)
-  )
-
-  formControl = new FormControl()
-
-  constructor(private facade: EditorFacade) {
-    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 isLicenses() {
-    return this.model === 'licenses'
+  get withoutWrapper() {
+    return this.model === 'title' || this.model === 'abstract'
   }
-  get isResourceUpdated() {
-    return this.model === 'resourceUpdated'
+
+  get valueAsString() {
+    return this.value as string
   }
-  get isUpdateFrequency() {
-    return this.model === 'updateFrequency'
+  get valueAsDate() {
+    return this.value as Date
   }
-  get isTemporalExtents() {
-    return this.model === 'temporalExtents'
+
+  get valueAsOverviews() {
+    return this.value as Array<GraphicOverview>
   }
-  get isSpatialExtentField() {
-    return this.model === 'spatialExtents'
+  get valueAsUpdateFrequency() {
+    return this.value as UpdateFrequency
   }
-  get isGraphicOverview() {
-    return this.model === 'overviews'
+  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/form-field/index.ts

@@ -1,6 +1,6 @@
 export * from './form-field-keywords/form-field-keywords.component'
 export * from './form-field-license/form-field-license.component'
-export * from './form-field-resource-updated/form-field-resource-updated.component'
+export * from './form-field-date-updated/form-field-date-updated.component'
 export * from './form-field-temporal-extents/form-field-temporal-extents.component'
 export * from './form-field-simple/form-field-simple.component'
 export * from './form-field-file/form-field-file.component'

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

@@ -1,32 +1,28 @@
-<ng-container>
-  <div class="flex flex-col gap-6 p-8">
-    <ng-container
-      *ngFor="
-        let section of facade.currentSections$ | async;
-        trackBy: sectionTracker
-      "
-    >
-      <ng-container *ngIf="!section.hidden">
-        <div class="flex flex-col gap-8 border p-8 rounded-[8px] shadow">
+<div class="flex flex-col gap-6">
+  <ng-container
+    *ngFor="
+      let section of facade.currentSections$ | async;
+      trackBy: sectionTracker
+    "
+  >
+    <ng-container *ngIf="!section.hidden">
+      <div class="flex flex-col gap-8 border p-8 rounded-[8px] shadow">
+        <div
+          class="flex flex-col gap-2"
+          [ngClass]="section.labelKey ? 'mb-4' : 'hidden'"
+        >
           <div
-            class="flex flex-col gap-2"
-            [ngClass]="section.labelKey ? 'mb-4' : 'hidden'"
+            *ngIf="section.labelKey"
+            class="text-2xl font-title text-main"
+            translate
           >
-            <div
-              *ngIf="section.labelKey"
-              class="text-2xl font-petrona text-secondary"
-              translate
-            >
-              {{ section.labelKey }}
-            </div>
-            <div
-              *ngIf="section.descriptionKey"
-              class="text-secondary-lightest"
-              translate
-            >
-              {{ section.descriptionKey }}
-            </div>
+            {{ section.labelKey }}
           </div>
+          <div *ngIf="section.descriptionKey" class="text-gray-800" translate>
+            {{ section.descriptionKey }}
+          </div>
+        </div>
+        <div class="grid auto-rows-auto grid-cols-2 gap-[32px]">
           <ng-container
             *ngFor="
               let field of section.fieldsWithValues;
@@ -35,7 +31,14 @@
           >
             <ng-container *ngIf="!field.config.hidden">
               <gn-ui-form-field
+                [ngClass]="
+                  field.config.gridColumnSpan === 1
+                    ? 'col-span-1'
+                    : 'col-span-2'
+                "
+                [uniqueIdentifier]="recordUniqueIdentifier$ | async"
                 [model]="field.config.model!"
+                [modelSpecifier]="field.config.modelSpecifier!"
                 [config]="field.config.formFieldConfig"
                 [value]="field.value"
                 (valueChange)="
@@ -45,7 +48,7 @@
             </ng-container>
           </ng-container>
         </div>
-      </ng-container>
+      </div>
     </ng-container>
-  </div>
-</ng-container>
+  </ng-container>
+</div>

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/wizard.component.html

@@ -1,9 +1,5 @@
-<div class="pl-5 pt-24 flex flex-1 flex-col justify-between">
-  <div
-    #wizardFields
-    class="flex-1 flex"
-    *ngFor="let config of configuration; let i = index"
-  >
+<div class="pl-5 pt-24 flex flex-1 flex-col justify-between" #wizardFields>
+  <div class="flex-1 flex" *ngFor="let config of configuration; let i = index">
     <gn-ui-wizard-field [wizardFieldConfig]="config"></gn-ui-wizard-field>
   </div>
 </div>

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],