geonetwork-ui 2.4.0-dev.503109c9 → 2.4.0-dev.575f30f2

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

@@ -0,0 +1,43 @@
+<ng-container [ngSwitch]="sectionDisplayed">
+  <ng-container *ngSwitchCase="'mainMenu'">
+    <div
+      data-test="importMenuMainSection"
+      class="mt-2 border border-gray-100 p-2 flex items-center bg-white shadow-2xl rounded-2xl"
+    >
+      <ul class="flex flex-col gap-2 w-full">
+        <li *ngFor="let menuItem of importMenuItems">
+          <gn-ui-button
+            [attr.data-test]="menuItem.dataTest"
+            type="light"
+            extraClass="flex flex-row items-center gap-2 w-full justify-start"
+            (buttonClick)="menuItem.action()"
+            ><mat-icon class="material-symbols-outlined">
+              {{ menuItem.icon }} </mat-icon
+            ><span>{{ menuItem.label }}</span></gn-ui-button
+          >
+        </li>
+      </ul>
+    </div>
+  </ng-container>
+  <ng-container *ngSwitchCase="'importExternalFile'">
+    <div
+      data-test="importMenuImportExternalFileSection"
+      class="p-6 flex flex-col gap-2 mt-2 border border-gray-100 bg-white shadow-2xl rounded-2xl"
+    >
+      <div class="flex flex-row items-center gap-2">
+        <gn-ui-button
+          data-test="importMenuImportExternalFileSectionBackButton"
+          type="light"
+          (buttonClick)="displayMainMenu()"
+        >
+          <mat-icon class="material-symbols-outlined">arrow_back</mat-icon>
+        </gn-ui-button>
+        <span class="font-bold"> {{ externalImportBackLabel }}</span>
+      </div>
+      <gn-ui-url-input
+        (valueChange)="importRecord($event)"
+        [disabled]="isRecordImportInProgress"
+      ></gn-ui-url-input>
+    </div>
+  </ng-container>
+</ng-container>

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

@@ -0,0 +1,129 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core'
+import { MatIconModule } from '@angular/material/icon'
+import { CommonModule } from '@angular/common'
+import { ButtonComponent, UrlInputComponent } from '../../../../../../../libs/ui/inputs/src'
+import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
+import { TranslateService } from '@ngx-translate/core'
+import { NotificationsService } from '../../../../../../../libs/feature/notifications/src'
+import { RecordsRepositoryInterface } from '../../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
+import { Router } from '@angular/router'
+
+interface ImportMenuItems {
+  label: string
+  icon: string
+  action: () => any
+  dataTest: string
+}
+
+type ImportMenuPage = 'mainMenu' | 'importExternalFile'
+
+@Component({
+  selector: 'gn-ui-import-record',
+  templateUrl: './import-record.component.html',
+  styleUrls: ['./import-record.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatIconModule,
+    ButtonComponent,
+    ThumbnailComponent,
+    UrlInputComponent,
+  ],
+})
+export class ImportRecordComponent {
+  @Output() closeImportMenu = new EventEmitter<void>()
+
+  importMenuItems: ImportMenuItems[] = [
+    {
+      label: this.translateService.instant('dashboard.importRecord.useModel'),
+      icon: 'highlight',
+      action: () => null,
+      dataTest: 'useAModelButton',
+    },
+    {
+      label: this.translateService.instant(
+        'dashboard.importRecord.importExternal'
+      ),
+      icon: 'cloud_download',
+      action: this.displayImportExternal.bind(this),
+      dataTest: 'importFromUrlButton',
+    },
+  ]
+
+  isRecordImportInProgress = false
+
+  sectionDisplayed: ImportMenuPage = 'mainMenu'
+
+  externalImportBackLabel = this.translateService.instant(
+    'dashboard.importRecord.importExternalLabel'
+  )
+
+  constructor(
+    private router: Router,
+    private translateService: TranslateService,
+    private cdr: ChangeDetectorRef,
+    private notificationsService: NotificationsService,
+    private recordsRepository: RecordsRepositoryInterface
+  ) {}
+
+  displayMainMenu() {
+    this.sectionDisplayed = 'mainMenu'
+    this.cdr.markForCheck()
+  }
+
+  displayImportExternal() {
+    this.sectionDisplayed = 'importExternalFile'
+    this.cdr.markForCheck()
+  }
+
+  importRecord(url: string) {
+    this.isRecordImportInProgress = true
+
+    this.recordsRepository.duplicateExternalRecord(url).subscribe({
+      next: (recordTempId) => {
+        if (recordTempId) {
+          this.notificationsService.showNotification(
+            {
+              type: 'success',
+              title: this.translateService.instant(
+                'editor.record.importFromExternalFile.success.title'
+              ),
+              text: `${this.translateService.instant(
+                'editor.record.importFromExternalFile.success.body'
+              )}`,
+            },
+            2500
+          )
+
+          this.router
+            .navigate(['/edit', recordTempId])
+            .catch((err) => console.error(err))
+        }
+        this.closeImportMenu.next()
+      },
+      error: (error) => {
+        this.notificationsService.showNotification(
+          {
+            type: 'error',
+            title: this.translateService.instant(
+              'editor.record.importFromExternalFile.failure.title'
+            ),
+            text: `${this.translateService.instant(
+              'editor.record.importFromExternalFile.failure.body'
+            )} ${error.message ?? ''}`,
+          },
+          2500
+        )
+        this.isRecordImportInProgress = false
+        this.cdr.markForCheck()
+      },
+    })
+  }
+}

package/src/libs/feature/editor/src/lib/components/online-resource-card/online-resource-card.component.html

@@ -0,0 +1,35 @@
+<div class="gn-ui-card">
+  <div
+    class="bg-gray-100 w-[56px] h-[56px] rounded-[4px] text-primary grid justify-center items-center shrink-0"
+  >
+    <mat-icon class="material-symbols-outlined">attach_file</mat-icon>
+  </div>
+  <div class="flex flex-col w-full items-start overflow-hidden leading-snug">
+    <div class="text-[16px] font-bold text-main" data-test="card-title">
+      {{ title }}
+    </div>
+    <div
+      class="text-[14px] text-gray-900"
+      *ngIf="subtitle"
+      data-test="card-subtitle"
+    >
+      <span>{{ subtitle }}</span>
+      <span *ngIf="fileSize">
+        •
+        {{
+          'editor.record.form.field.onlineResource.fileSize'
+            | translate: { sizeMB: fileSize }
+        }}</span
+      >
+      <span *ngIf="identifierInService"> • {{ identifierInService }}</span>
+    </div>
+    <button
+      class="gn-ui-link text-[14px]"
+      translate
+      (click)="modifyClick.emit(onlineResource)"
+      data-test="card-modify"
+    >
+      editor.record.form.field.onlineResource.modify
+    </button>
+  </div>
+</div>

package/src/libs/feature/editor/src/lib/components/online-resource-card/online-resource-card.component.ts

@@ -0,0 +1,79 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import {
+  DatasetDownloadDistribution,
+  OnlineLinkResource,
+  OnlineResource,
+} from '../../../../../../../libs/common/domain/src/lib/model/record'
+import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
+import { MatIconModule } from '@angular/material/icon'
+import { bytesToMegabytes, getFileFormat } from '../../../../../../../libs/util/shared/src'
+import { ButtonComponent } from '../../../../../../../libs/ui/inputs/src'
+import { TranslateModule } from '@ngx-translate/core'
+
+@Component({
+  selector: 'gn-ui-online-resource-card',
+  standalone: true,
+  imports: [
+    CommonModule,
+    ThumbnailComponent,
+    MatIconModule,
+    ButtonComponent,
+    TranslateModule,
+  ],
+  templateUrl: './online-resource-card.component.html',
+  styleUrls: ['./online-resource-card.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class OnlineResourceCardComponent {
+  @Input() onlineResource: OnlineResource
+  @Output() modifyClick = new EventEmitter<OnlineResource>()
+
+  get title(): string {
+    switch (this.onlineResource.type) {
+      case 'link':
+      case 'service':
+      case 'download':
+        return (
+          this.onlineResource.name ??
+          this.onlineResource.description ??
+          '(unknown)'
+        )
+      case 'endpoint':
+        return this.onlineResource.description
+    }
+  }
+
+  get subtitle(): string {
+    switch (this.onlineResource.type) {
+      case 'service':
+        return `${this.onlineResource.accessServiceProtocol}`
+      case 'endpoint':
+        return `${this.onlineResource.protocol}`
+      case 'link':
+      case 'download':
+        return this.getFormat(this.onlineResource)
+    }
+  }
+
+  get fileSize(): string {
+    if (this.onlineResource.type !== 'download') return ''
+    if (!this.onlineResource.sizeBytes) return ''
+    return bytesToMegabytes(this.onlineResource.sizeBytes).toLocaleString()
+  }
+
+  get identifierInService(): string {
+    if (this.onlineResource.type !== 'service') return ''
+    return this.onlineResource.identifierInService ?? ''
+  }
+
+  getFormat(onlineResource: OnlineLinkResource | DatasetDownloadDistribution) {
+    return (getFileFormat(onlineResource) || '').toUpperCase()
+  }
+}

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.css

@@ -0,0 +1,4 @@
+:host {
+  --gn-ui-button-padding: 8px 8px;
+  --gn-ui-button-rounded: 8px;
+}

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

@@ -1,16 +1,10 @@
 <div class="flex flex-col gap-3">
   <div class="flex flex-row flex-wrap gap-2" data-test="rolesToPick">
     <ng-container *ngFor="let role of rolesToPick">
-      <gn-ui-button
-        extraClass="px-2 py-1.5"
-        (buttonClick)="addRoleToDisplay(role)"
-      >
-        <div class="flex flex-row gap-1 items-center">
-          <span class="text-primary text-[20px] leading-[0] font-bold pb-[5px]"
-            >&#8330;</span
-          >
-          <span class="font-bold" translate>{{ roleToLabel(role) }}</span>
-        </div>
+      <gn-ui-button type="gray" (buttonClick)="addRoleToDisplay(role)">
+        <mat-icon class="material-symbols-outlined text-primary">add</mat-icon>
+        &nbsp;
+        <span translate>{{ roleToLabel(role) }}</span>
       </gn-ui-button>
     </ng-container>
   </div>
@@ -43,23 +37,19 @@
         [displayWithFn]="displayWithFn"
         [minCharacterCount]="1"
         [clearOnSelection]="true"
+        [allowSubmit]="false"
       >
       </gn-ui-autocomplete>
 
       <ng-container *ngIf="contactsForRessourceByRole.get(role) as contacts">
-        <ng-container *ngIf="contacts.length > 1">
-          <gn-ui-sortable-list
-            [elements]="contactsAsDynElemByRole.get(role)"
-            (elementsChange)="handleContactsChanged($event)"
-          ></gn-ui-sortable-list>
-        </ng-container>
-        <ng-container *ngIf="contacts.length === 1">
-          <ng-container *ngFor="let contact of contacts">
-            <gn-ui-contact-card
-              [contact]="contact"
-              (contactRemoved)="removeContact(index)"
-            ></gn-ui-contact-card> </ng-container
-        ></ng-container>
+        <gn-ui-sortable-list
+          [items]="contacts"
+          (itemsOrderChange)="handleContactsChanged($event)"
+          [elementTemplate]="contactTemplate"
+        ></gn-ui-sortable-list>
+        <ng-template #contactTemplate let-contact>
+          <gn-ui-contact-card [contact]="contact"></gn-ui-contact-card>
+        </ng-template>
       </ng-container>
 
       <hr class="border-t-[#D6D3D1] mt-4 mb-6" *ngIf="!isLast" />

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

@@ -1,7 +1,6 @@
 import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
-  ChangeDetectorRef,
   Component,
   EventEmitter,
   Input,
@@ -18,10 +17,7 @@ import {
 import { UserModel } from '../../../../../../../../../libs/common/domain/src/lib/model/user'
 import { OrganizationsServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
-import {
-  DynamicElement,
-  SortableListComponent,
-} from '../../../../../../../../../libs/ui/elements/src'
+import { SortableListComponent } from '../../../../../../../../../libs/ui/layout/src'
 import {
   AutocompleteComponent,
   DropdownSelectorComponent,
@@ -34,11 +30,11 @@ import {
   debounceTime,
   distinctUntilChanged,
   firstValueFrom,
-  Observable,
   switchMap,
 } from 'rxjs'
 import { map } from 'rxjs/operators'
 import { ContactCardComponent } from '../../../contact-card/contact-card.component'
+import { MatIconModule } from '@angular/material/icon'
 
 @Component({
   selector: 'gn-ui-form-field-contacts-for-resource',
@@ -55,6 +51,7 @@ import { ContactCardComponent } from '../../../contact-card/contact-card.compone
     TranslateModule,
     ContactCardComponent,
     SortableListComponent,
+    MatIconModule,
   ],
 })
 export class FormFieldContactsForResourceComponent
@@ -65,8 +62,6 @@ export class FormFieldContactsForResourceComponent
 
   contactsForRessourceByRole: Map<Role, Individual[]> = new Map()
 
-  contactsAsDynElemByRole: Map<Role, DynamicElement[]> = new Map()
-
   rolesToPick: Role[] = [
     'resource_provider',
     'custodian',
@@ -133,35 +128,6 @@ export class FormFieldContactsForResourceComponent
 
       return acc
     }, new Map<Role, Individual[]>())
-
-    this.contactsAsDynElemByRole = this.value.reduce((acc, contact) => {
-      const completeOrganization = this.allOrganizations.get(
-        contact.organization.name
-      )
-
-      const updatedContact = {
-        ...contact,
-        organization:
-          completeOrganization ??
-          ({ name: contact.organization.name } as Organization),
-      }
-
-      const contactAsDynElem = {
-        component: ContactCardComponent,
-        inputs: {
-          contact: updatedContact,
-          removable: false,
-        },
-      } as DynamicElement
-
-      if (!acc.has(contact.role)) {
-        acc.set(contact.role, [])
-      }
-
-      acc.get(contact.role).push(contactAsDynElem)
-
-      return acc
-    }, new Map<Role, DynamicElement[]>())
   }
 
   manageRoleSectionsToDisplay(contactsForResource: Individual[]) {
@@ -181,14 +147,11 @@ export class FormFieldContactsForResourceComponent
     this.valueChange.emit(newContactsforRessource)
   }
 
-  handleContactsChanged(event: DynamicElement[]) {
-    const newContactsOrdered = event.map(
-      (contactAsDynElem) => contactAsDynElem.inputs['contact']
-    ) as Individual[]
-
-    const role = newContactsOrdered[0].role
+  handleContactsChanged(items: unknown[]) {
+    const contacts = items as Individual[]
+    const role = contacts[0].role
 
-    this.contactsForRessourceByRole.set(role, newContactsOrdered)
+    this.contactsForRessourceByRole.set(role, contacts)
 
     const newControlValue = Array.from(
       this.contactsForRessourceByRole.values()

package/src/libs/feature/editor/src/lib/components/record-form/form-field/{form-field-resource-updated/form-field-resource-updated.component.ts → form-field-date-updated/form-field-date-updated.component.ts}

@@ -8,14 +8,14 @@ import {
 import { DatePickerComponent } from '../../../../../../../../../libs/ui/inputs/src'
 
 @Component({
-  selector: 'gn-ui-form-field-resource-updated',
-  templateUrl: './form-field-resource-updated.component.html',
-  styleUrls: ['./form-field-resource-updated.component.css'],
+  selector: 'gn-ui-form-field-date-updated',
+  templateUrl: './form-field-date-updated.component.html',
+  styleUrls: ['./form-field-date-updated.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [DatePickerComponent],
 })
-export class FormFieldResourceUpdatedComponent {
+export class FormFieldDateUpdatedComponent {
   @Input() value: Date
   @Output() valueChange: EventEmitter<Date> = new EventEmitter()
 }

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

@@ -1,9 +1,10 @@
 <div class="flex flex-col gap-3">
   <gn-ui-generic-keywords
-    [keywords]="value"
+    [keywords]="filteredKeywords"
     [keywordTypes]="keywordTypes"
-    [placeholder]="placeholder | translate"
+    [placeholder]="'editor.form.keywords.placeholder' | translate"
     (changedKeywords)="handleKeywordsChange($event)"
+    [allowSubmit]="false"
   >
   </gn-ui-generic-keywords>
 </div>

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

@@ -16,6 +16,10 @@ import { Keyword } from '../../../../../../../../../libs/common/domain/src/lib/m
 import { GenericKeywordsComponent } from '../../../generic-keywords/generic-keywords.component'
 import { TranslateModule } from '@ngx-translate/core'
 import { KeywordType } from '../../../../../../../../../libs/common/domain/src/lib/model/thesaurus'
+import { EditorFacade } from '../../../../+state/editor.facade'
+import { firstValueFrom, map } from 'rxjs'
+import { SPATIAL_SCOPES } from '../../../../fields.config'
+import { all } from 'ol/loadingstrategy'
 
 @Component({
   selector: 'gn-ui-form-field-keywords',
@@ -38,9 +42,37 @@ export class FormFieldKeywordsComponent {
   @Output() valueChange: EventEmitter<Keyword[]> = new EventEmitter()
 
   keywordTypes = ['temporal', 'theme', 'other'] as KeywordType[]
-  placeholder = 'editor.form.keywords.placeholder'
 
-  handleKeywordsChange(keywords: Keyword[]) {
-    this.valueChange.emit(keywords)
+  get filteredKeywords(): Keyword[] {
+    return (
+      this.value?.filter(
+        (keyword) =>
+          keyword.type !== 'place' && // filter out place keywords
+          !SPATIAL_SCOPES.some(
+            (spatialScope) => spatialScope.label === keyword.label
+          ) // filter out keywords matching spatialScope keys
+      ) || []
+    )
+  }
+
+  constructor(private editorFacade: EditorFacade) {}
+
+  async handleKeywordsChange(keywords: Keyword[]) {
+    const filteredKeywords = await firstValueFrom(
+      this.editorFacade.record$.pipe(
+        map((record) =>
+          record.keywords.filter(
+            (k) =>
+              k.type === 'place' || // get back place keyword
+              SPATIAL_SCOPES.some(
+                (spatialScope) => spatialScope.label === k.label // get back spatialScope keywords
+              )
+          )
+        )
+      )
+    )
+
+    const allKeywords = [...filteredKeywords, ...keywords]
+    this.valueChange.emit(allKeywords)
   }
 }

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

@@ -0,0 +1,8 @@
+:host {
+  display: grid; /* this is required to be able to size the dropdown */
+}
+
+gn-ui-dropdown-selector {
+  /* FIXME: this includes the grid gap from the editor form, but there should be no dependency */
+  max-width: calc(50% - 16px);
+}

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

@@ -0,0 +1,34 @@
+<gn-ui-file-input
+  [maxSizeMB]="MAX_UPLOAD_SIZE_MB"
+  (fileChange)="handleFileChange($event)"
+  (uploadCancel)="handleUploadCancel()"
+  [uploadProgress]="uploadProgress"
+  (urlChange)="handleUrlChange($event)"
+></gn-ui-file-input>
+<div class="h-[8px]"></div>
+<gn-ui-sortable-list
+  [items]="linkResources"
+  (itemsOrderChange)="handleResourcesChange($event)"
+  [elementTemplate]="template"
+>
+</gn-ui-sortable-list>
+<ng-template #template let-onlineResource let-index="index">
+  <gn-ui-online-resource-card
+    [onlineResource]="onlineResource"
+    (modifyClick)="handleResourceModify(onlineResource, index)"
+  ></gn-ui-online-resource-card>
+</ng-template>
+
+<ng-template #dialogTemplate let-onlineResource>
+  <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+    editor.record.form.field.onlineResource.edit.title
+  </h3>
+  <gn-ui-text-input
+    extraClass="mb-[16px]"
+    [(value)]="onlineResource.name"
+  ></gn-ui-text-input>
+  <h3 class="text-[16px] font-bold text-main mb-[12px]" translate>
+    editor.record.form.field.onlineResource.edit.description
+  </h3>
+  <gn-ui-text-area [(value)]="onlineResource.description"></gn-ui-text-area>
+</ng-template>