geonetwork-ui 2.4.0-dev.d000fb89 → 2.4.0-dev.d3529f01

package/src/libs/feature/dataviz/src/lib/geo-table-view/geo-table-view.component.ts

@@ -1,36 +1,21 @@
 import {
-  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  Inject,
   Input,
   OnDestroy,
   OnInit,
   ViewChild,
 } from '@angular/core'
-import {
-  FEATURE_MAP_OPTIONS,
-  FeatureInfoService,
-  MapContextLayerTypeEnum,
-  MapContextModel,
-  MapManagerService,
-  MapOptionsModel,
-} from '../../../../../../libs/feature/map/src'
 import {
   TableComponent,
   TableItemId,
   TableItemModel,
 } from '../../../../../../libs/ui/dataviz/src'
-import type { FeatureCollection } from 'geojson'
-import Map from 'ol/Map'
-import View from 'ol/View'
-import Feature from 'ol/Feature'
-import { Geometry } from 'ol/geom'
-import VectorLayer from 'ol/layer/Vector'
-import VectorSource from 'ol/source/Vector'
-import Style from 'ol/style/Style'
+import type { Feature, FeatureCollection } from 'geojson'
 import { Subscription } from 'rxjs'
+import { MapContext } from '@geospatial-sdk/core'
+import { MapContainerComponent } from '../../../../../../libs/ui/map/src'
 
 @Component({
   selector: 'gn-ui-geo-table-view',
@@ -38,50 +23,26 @@ import { Subscription } from 'rxjs'
   styleUrls: ['./geo-table-view.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
+export class GeoTableViewComponent implements OnInit, OnDestroy {
   @Input() data: FeatureCollection = { type: 'FeatureCollection', features: [] }
-  @ViewChild(TableComponent) uiTable: TableComponent
-
-  private map: Map
-  private view: View
-  private vectorLayer: VectorLayer<VectorSource<Feature<Geometry>>>
-  private vectorSource: VectorSource<Feature<Geometry>>
-  private features: Feature<Geometry>[]
+  @ViewChild('table') uiTable: TableComponent
+  @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   tableData: TableItemModel[]
-  mapContext: MapContextModel
+  mapContext: MapContext
   selectionId: TableItemId
-  selection: Feature<Geometry>
+  selection: Feature
   private subscription = new Subscription()
 
-  constructor(
-    private manager: MapManagerService,
-    private featureInfo: FeatureInfoService,
-    private changeRef: ChangeDetectorRef,
-    @Inject(FEATURE_MAP_OPTIONS) private mapOptions: MapOptionsModel
-  ) {}
+  get features() {
+    return this.data.features
+  }
+
+  constructor(private changeRef: ChangeDetectorRef) {}
 
   ngOnInit(): void {
     this.tableData = this.geojsonToTableData(this.data)
     this.mapContext = this.initMapContext()
-    this.featureInfo.handleFeatureInfo()
-    this.subscription.add(
-      this.featureInfo.features$.subscribe((features) => {
-        this.onMapFeatureSelect(features)
-      })
-    )
-  }
-
-  ngAfterViewInit(): void {
-    const map = (this.map = this.manager.map)
-    this.view = map.getView()
-    this.vectorLayer = this.manager.map.getLayers().item(1) as VectorLayer<
-      VectorSource<Feature<Geometry>>
-    >
-    this.vectorLayer.setStyle(this.styleFn.bind(this))
-    this.vectorSource = this.vectorLayer.getSource()
-    this.features = this.vectorSource.getFeatures()
-    this.view.fit(this.vectorSource.getExtent())
   }
 
   onTableSelect(tableEntry: TableItemModel) {
@@ -93,12 +54,13 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  onMapFeatureSelect(features: Feature<Geometry>[]): void {
+  onMapFeatureSelect(features: Feature[]): void {
     this.selection = features?.length > 0 && features[0]
     if (this.selection) {
-      this.selectionId = this.selection.getId()
+      // FIXME: show styling for selection
+      this.selectionId = this.selection.id
       this.changeRef.detectChanges()
-      this.vectorLayer.changed()
+      // this.vectorLayer.changed()
       this.uiTable.scrollToItem(this.selectionId)
     }
   }
@@ -110,44 +72,42 @@ export class GeoTableViewComponent implements OnInit, AfterViewInit, OnDestroy {
     }))
   }
 
-  private initMapContext(): MapContextModel {
+  private initMapContext(): MapContext {
     return {
       layers: [
         {
-          type: MapContextLayerTypeEnum.XYZ,
+          type: 'xyz',
           url: 'https://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png',
         },
         {
-          type: MapContextLayerTypeEnum.GEOJSON,
+          type: 'geojson',
           data: this.data,
         },
       ],
+      view: {
+        center: [0, 0],
+        zoom: 2,
+      },
     }
   }
 
-  private animateToFeature(feature: Feature<Geometry>): void {
-    this.view.fit(feature.getGeometry().getExtent(), {
-      duration: 1000,
-      maxZoom: 11,
-    })
+  private animateToFeature(feature: Feature): void {
+    this.mapContext = {
+      ...this.mapContext,
+      view: {
+        geometry: feature.geometry,
+        maxZoom: 13,
+      },
+    }
+    // FIXME: animate the view
+    // this.view.fit(feature.getGeometry().getExtent(), {
+    //   duration: 1000,
+    //   maxZoom: 11,
+    // })
   }
 
   private getFeatureFromId(id: TableItemId) {
-    return this.features.find((feature) => feature.getId() === id)
-  }
-
-  private styleFn(
-    feature: Feature<Geometry>,
-    resolution: number
-  ): void | Style | Style[] {
-    if (
-      this.selectionId !== undefined &&
-      this.selectionId === feature.getId()
-    ) {
-      return this.mapOptions.hlStyle(feature, resolution)
-    } else {
-      return this.mapOptions.defaultStyle(feature, resolution)
-    }
+    return this.features.find((feature) => feature.id === id)
   }
 
   ngOnDestroy(): void {

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -24,7 +24,7 @@ import type { FeatureCollection } from 'geojson'
 import { from, Observable, throwError } from 'rxjs'
 import { catchError, map, switchMap, tap } from 'rxjs/operators'
 import {
-  DatasetDistribution,
+  DatasetOnlineResource,
   DatasetServiceDistribution,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -135,7 +135,7 @@ export class DataService {
 
   getDownloadLinksFromWfs(
     wfsLink: DatasetServiceDistribution
-  ): Observable<DatasetDistribution[]> {
+  ): Observable<DatasetOnlineResource[]> {
     // Pour DL toutes les données
     return this.getDownloadUrlsFromWfs(
       wfsLink.url.toString(),
@@ -157,7 +157,7 @@ export class DataService {
 
   async getDownloadLinksFromOgcApiFeatures(
     ogcApiLink: DatasetServiceDistribution
-  ): Promise<DatasetDistribution[]> {
+  ): Promise<DatasetOnlineResource[]> {
     const collectionInfo = await this.getDownloadUrlsFromOgcApi(
       ogcApiLink.url.href
     )
@@ -199,7 +199,7 @@ export class DataService {
 
   getDownloadLinksFromEsriRest(
     esriRestLink: DatasetServiceDistribution
-  ): DatasetDistribution[] {
+  ): DatasetOnlineResource[] {
     return ['json', 'geojson'].map((format) => ({
       ...esriRestLink,
       url: new URL(
@@ -209,7 +209,7 @@ export class DataService {
     }))
   }
 
-  readAsGeoJson(link: DatasetDistribution): Observable<FeatureCollection> {
+  readAsGeoJson(link: DatasetOnlineResource): Observable<FeatureCollection> {
     return this.getDataset(link).pipe(
       switchMap((dataset) => dataset.selectAll().read()),
       map((features) => ({
@@ -219,7 +219,7 @@ export class DataService {
     )
   }
 
-  getDataset(link: DatasetDistribution): Observable<BaseReader> {
+  getDataset(link: DatasetOnlineResource): Observable<BaseReader> {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       return this.getDownloadUrlsFromWfs(link.url.toString(), link.name).pipe(
         switchMap((urls) => {

package/src/libs/feature/dataviz/src/lib/table-view/table-view.component.ts

@@ -11,7 +11,7 @@ import {
 import { DataItem, FetchError } from '../../../../../../libs/util/data-fetcher/src'
 import { DataService } from '../service/data.service'
 import { TableItemModel } from '../../../../../../libs/ui/dataviz/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateService } from '@ngx-translate/core'
 
 @Component({
@@ -21,10 +21,10 @@ import { TranslateService } from '@ngx-translate/core'
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TableViewComponent {
-  @Input() set link(value: DatasetDistribution) {
+  @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
-  private currentLink$ = new BehaviorSubject<DatasetDistribution>(null)
+  private currentLink$ = new BehaviorSubject<DatasetOnlineResource>(null)
 
   loading = false
   error = null
@@ -59,7 +59,7 @@ export class TableViewComponent {
     private translateService: TranslateService
   ) {}
 
-  fetchData(link: DatasetDistribution): Observable<DataItem[]> {
+  fetchData(link: DatasetOnlineResource): Observable<DataItem[]> {
     return this.dataService
       .getDataset(link)
       .pipe(switchMap((dataset) => dataset.read()))

package/src/libs/feature/editor/src/index.ts

@@ -5,6 +5,7 @@ export * from './lib/+state/editor.reducer'
 export * from './lib/+state/editor.actions'
 export * from './lib/feature-editor.module'
 export * from './lib/services/editor.service'
+export * from './lib/components/import-record/import-record.component'
 export * from './lib/components/record-form/record-form.component'
 export * from './lib/components/wizard/wizard.component'
 export * from './lib/components/wizard-field/wizard-field.component'

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -9,6 +9,7 @@ import {
   selectEditorConfig,
   selectRecord,
   selectRecordAlreadySavedOnce,
+  selectRecordSource,
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
@@ -24,12 +25,13 @@ export class EditorEffects {
       ofType(EditorActions.saveRecord),
       withLatestFrom(
         this.store.select(selectRecord),
+        this.store.select(selectRecordSource),
         this.store.select(selectEditorConfig),
         this.store.select(selectRecordAlreadySavedOnce)
       ),
-      switchMap(([, record, fieldsConfig, alreadySavedOnce]) =>
+      switchMap(([, record, recordSource, fieldsConfig, alreadySavedOnce]) =>
         this.editorService
-          .saveRecord(record, fieldsConfig, !alreadySavedOnce)
+          .saveRecord(record, recordSource, fieldsConfig, !alreadySavedOnce)
           .pipe(
             switchMap(([record, recordSource]) =>
               of(
@@ -64,8 +66,13 @@ export class EditorEffects {
     this.actions$.pipe(
       ofType(EditorActions.updateRecordField),
       debounceTime(1000),
-      withLatestFrom(this.store.select(selectRecord)),
-      switchMap(([, record]) => this.editorService.saveRecordAsDraft(record)),
+      withLatestFrom(
+        this.store.select(selectRecord),
+        this.store.select(selectRecordSource)
+      ),
+      switchMap(([, record, recordSource]) =>
+        this.editorService.saveRecordAsDraft(record, recordSource)
+      ),
       map(() => EditorActions.draftSaveSuccess())
     )
   )

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

@@ -1,27 +1,15 @@
-<div class="flex flex-row gap-4 items-center">
-  <div class="flex flex-row border border-gray-200 rounded-xl p-4 gap-4 w-full">
-    <gn-ui-thumbnail
-      class="w-[56px] h-[56px] rounded-[4px]"
-      [thumbnailUrl]="contact.organization.logoUrl?.href"
-      [fit]="'contain'"
-    ></gn-ui-thumbnail>
-    <div class="flex flex-col w-full">
-      <div class="flex flex-row justify-between">
-        <span
-          class="flex flex-wrap font-bold w-full"
-          data-test="contactCardName"
-          >{{ contact.firstName }} {{ contact.lastName }}</span
-        >
-      </div>
-      <div data-test="contactCardEmail">{{ contact.email }}</div>
+<div class="gn-ui-card">
+  <gn-ui-thumbnail
+    class="w-[56px] h-[56px] rounded-[4px] overflow-hidden shrink-0"
+    [thumbnailUrl]="contact.organization?.logoUrl?.href"
+    [fit]="'contain'"
+  ></gn-ui-thumbnail>
+  <div class="flex flex-col w-full overflow-hidden leading-snug">
+    <div class="text-[16px] font-bold text-main" data-test="contactCardName">
+      {{ contact.firstName }} {{ contact.lastName }}
+    </div>
+    <div class="text-[14px] text-gray-900" data-test="contactCardEmail">
+      {{ contact.email }}
     </div>
   </div>
-  <gn-ui-button
-    *ngIf="removable"
-    data-test="removeContactButton"
-    type="light"
-    extraClass="w-[20px] h-[20px] flex items-center justify-center"
-    (buttonClick)="removeContact(contact)"
-    ><span class="material-symbols-outlined"> close </span>
-  </gn-ui-button>
 </div>

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

@@ -1,10 +1,4 @@
-import {
-  ChangeDetectionStrategy,
-  Component,
-  EventEmitter,
-  Input,
-  Output,
-} from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { Individual } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import { MatIconModule } from '@angular/material/icon'
 import { CommonModule } from '@angular/common'
@@ -21,10 +15,4 @@ import { ThumbnailComponent } from '../../../../../../../libs/ui/elements/src'
 })
 export class ContactCardComponent {
   @Input() contact: Individual
-  @Input() removable = true
-  @Output() contactRemoved = new EventEmitter<Individual>()
-
-  removeContact(contact: Individual) {
-    this.contactRemoved.emit(contact)
-  }
 }

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.ts

@@ -41,6 +41,7 @@ export class GenericKeywordsComponent {
   @Input() keywords: Keyword[]
   @Input() keywordTypes: KeywordType[]
   @Input() placeholder: string
+  @Input() allowSubmit: boolean
   @Output() changedKeywords: EventEmitter<Keyword[]> = new EventEmitter()
   @Output() addedKeyword: EventEmitter<Keyword> = new EventEmitter()
   @Output() deletedKeyword: EventEmitter<Keyword> = new EventEmitter()

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

@@ -0,0 +1,47 @@
+<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()"
+            [disabled]="menuItem.disabled"
+            [title]="
+              (menuItem.disabled ? 'editor.temporary.disabled' : '') | translate
+            "
+            ><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,132 @@
+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 { TranslateModule, 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
+  disabled?: boolean
+}
+
+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,
+    TranslateModule,
+  ],
+})
+export class ImportRecordComponent {
+  @Output() closeImportMenu = new EventEmitter<void>()
+
+  importMenuItems: ImportMenuItems[] = [
+    {
+      label: this.translateService.instant('dashboard.importRecord.useModel'),
+      icon: 'highlight',
+      action: () => null,
+      dataTest: 'useAModelButton',
+      disabled: true,
+    },
+    {
+      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>