geonetwork-ui 2.5.0-dev.77e75b46a → 2.5.0-dev.8be73f10b

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

@@ -1,11 +1,11 @@
 <div class="flex flex-row h-full overflow-auto">
-  <gn-ui-table
+  <gn-ui-data-table
     #table
     class="w-1/2 overflow-auto"
-    [data]="tableData"
+    [dataset]="dataset"
     [activeId]="selectionId"
     (selected)="onTableSelect($event)"
-  ></gn-ui-table>
+  ></gn-ui-data-table>
   <gn-ui-map-container
     #mapContainer
     class="w-1/2 h-full"

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

@@ -8,7 +8,7 @@ import {
   ViewChild,
 } from '@angular/core'
 import {
-  TableComponent,
+  DataTableComponent,
   TableItemId,
   TableItemModel,
 } from '../../../../../../libs/ui/dataviz/src'
@@ -19,18 +19,19 @@ import {
   FeatureDetailComponent,
   MapContainerComponent,
 } from '../../../../../../libs/ui/map/src'
+import { BaseReader } from '../../../../../../libs/util/data-fetcher/src'
 
 @Component({
   selector: 'gn-ui-geo-table-view',
   templateUrl: './geo-table-view.component.html',
   styleUrls: ['./geo-table-view.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [TableComponent, MapContainerComponent, FeatureDetailComponent],
+  imports: [MapContainerComponent, FeatureDetailComponent, DataTableComponent],
   standalone: true,
 })
 export class GeoTableViewComponent implements OnInit, OnDestroy {
-  @Input() data: FeatureCollection = { type: 'FeatureCollection', features: [] }
-  @ViewChild('table') uiTable: TableComponent
+  @Input() dataset: BaseReader
+  @ViewChild('table') uiTable: DataTableComponent
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   tableData: TableItemModel[]
@@ -39,21 +40,16 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
   selection: Feature
   private subscription = new Subscription()
 
-  get features() {
-    return this.data.features
-  }
-
   constructor(private changeRef: ChangeDetectorRef) {}
 
-  ngOnInit(): void {
-    this.tableData = this.geojsonToTableData(this.data)
-    this.mapContext = this.initMapContext()
+  async ngOnInit() {
+    this.mapContext = await this.initMapContext()
   }
 
   onTableSelect(tableEntry: TableItemModel) {
     const { id } = tableEntry
     this.selectionId = id
-    this.selection = this.getFeatureFromId(id)
+    // this.selection = this.getFeatureFromId(id)
     if (this.selection) {
       this.animateToFeature(this.selection)
     }
@@ -77,7 +73,8 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
     }))
   }
 
-  private initMapContext(): MapContext {
+  private async initMapContext(): Promise<MapContext> {
+    this.dataset.selectAll()
     return {
       layers: [
         {
@@ -86,7 +83,11 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
         },
         {
           type: 'geojson',
-          data: this.data,
+          data: {
+            type: 'FeatureCollection',
+            // FIXME: we're not getting geojson here
+            features: await this.dataset.read(),
+          },
         },
       ],
       view: {
@@ -112,7 +113,8 @@ export class GeoTableViewComponent implements OnInit, OnDestroy {
   }
 
   private getFeatureFromId(id: TableItemId) {
-    return this.features.find((feature) => feature.id === id)
+    // FIXME: restore this once we need it?
+    // return this.features.find((feature) => feature.id === id)
   }
 
   ngOnDestroy(): void {

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

@@ -164,17 +164,26 @@ export class DataService {
       wfsLink.url.toString(),
       wfsLink.name
     ).pipe(
-      map((urls) => urls.all),
-      map((urls) =>
-        Object.keys(urls).map((format) => ({
-          ...wfsLink,
-          type: 'download',
-          url: new URL(urls[format]),
-          mimeType: getMimeTypeForFormat(
-            getFileFormatFromServiceOutput(format)
-          ),
-        }))
-      )
+      map((urls) => {
+        if (urls.geojson) {
+          urls.all['application/json'] = urls.geojson
+        }
+        return urls
+      }),
+      map((urls) => {
+        const resources: DatasetOnlineResource[] = Object.keys(urls.all).map(
+          (format) => ({
+            ...wfsLink,
+            name: wfsLink.name,
+            type: 'download' as const,
+            url: new URL(urls.all[format]),
+            mimeType: getMimeTypeForFormat(
+              getFileFormatFromServiceOutput(format)
+            ),
+          })
+        )
+        return resources
+      })
     )
   }
 
@@ -187,6 +196,7 @@ export class DataService {
     return Object.keys(collectionInfo.bulkDownloadLinks).map((downloadLink) => {
       return {
         ...ogcApiLink,
+        name: collectionInfo.id,
         type: 'download',
         url: new URL(collectionInfo.bulkDownloadLinks[downloadLink]),
         mimeType: getMimeTypeForFormat(
@@ -232,8 +242,11 @@ export class DataService {
     }))
   }
 
-  readAsGeoJson(link: DatasetOnlineResource): Observable<FeatureCollection> {
-    return this.getDataset(link).pipe(
+  readAsGeoJson(
+    link: DatasetOnlineResource,
+    cacheActive: boolean
+  ): Observable<FeatureCollection> {
+    return this.getDataset(link, cacheActive).pipe(
       switchMap((dataset) => dataset.selectAll().read()),
       map((features) => ({
         type: 'FeatureCollection',
@@ -242,13 +255,21 @@ export class DataService {
     )
   }
 
-  getDataset(link: DatasetOnlineResource): Observable<BaseReader> {
+  getDataset(
+    link: DatasetOnlineResource,
+    cacheActive: boolean
+  ): Observable<BaseReader> {
     if (link.type === 'service' && link.accessServiceProtocol === 'wfs') {
       const wfsUrlEndpoint = this.proxy.getProxiedUrl(link.url.toString())
       return from(
-        openDataset(wfsUrlEndpoint, 'wfs', {
-          wfsFeatureType: link.name,
-        })
+        openDataset(
+          wfsUrlEndpoint,
+          'wfs',
+          {
+            wfsFeatureType: link.name,
+          },
+          cacheActive
+        )
       )
     } else if (link.type === 'download') {
       const linkProxifiedUrl = this.proxy.getProxiedUrl(link.url.toString())
@@ -257,7 +278,9 @@ export class DataService {
         SupportedTypes.indexOf(format as any) > -1
           ? (format as SupportedType)
           : undefined
-      return from(openDataset(linkProxifiedUrl, supportedType)).pipe()
+      return from(
+        openDataset(linkProxifiedUrl, supportedType, undefined, cacheActive)
+      ).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'esriRest'
@@ -266,7 +289,7 @@ export class DataService {
         link.url.toString(),
         'geojson'
       )
-      return from(openDataset(url, 'geojson')).pipe()
+      return from(openDataset(url, 'geojson', undefined, cacheActive)).pipe()
     } else if (
       link.type === 'service' &&
       link.accessServiceProtocol === 'ogcFeatures'
@@ -274,7 +297,7 @@ export class DataService {
       return from(this.getDownloadUrlsFromOgcApi(link.url.href)).pipe(
         switchMap((collectionInfo) => {
           const geojsonUrl = collectionInfo.jsonDownloadLink
-          return openDataset(geojsonUrl, 'geojson')
+          return openDataset(geojsonUrl, 'geojson', undefined, cacheActive)
         }),
         tap((url) => {
           if (url === null) {

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

@@ -1,10 +1,11 @@
 <div class="w-full h-full flex flex-col">
   <div class="relative h-full">
-    <gn-ui-table
+    <gn-ui-data-table
+      *ngIf="tableData$ | async as dataset"
       class="overflow-auto grow"
-      [data]="tableData$ | async"
+      [dataset]="dataset"
       (selected)="onTableSelect($event)"
-    ></gn-ui-table>
+    ></gn-ui-data-table>
     <gn-ui-loading-mask
       *ngIf="loading"
       class="absolute inset-0"

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

@@ -3,14 +3,13 @@ import { BehaviorSubject, Observable, of } from 'rxjs'
 import {
   catchError,
   finalize,
-  map,
   shareReplay,
   startWith,
   switchMap,
 } from 'rxjs/operators'
-import { DataItem, FetchError } from '../../../../../../libs/util/data-fetcher/src'
+import { BaseReader, FetchError } from '../../../../../../libs/util/data-fetcher/src'
 import { DataService } from '../service/data.service'
-import { TableComponent, TableItemModel } from '../../../../../../libs/ui/dataviz/src'
+import { DataTableComponent } from '../../../../../../libs/ui/dataviz/src'
 import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
 import {
@@ -26,7 +25,7 @@ import { CommonModule } from '@angular/common'
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     CommonModule,
-    TableComponent,
+    DataTableComponent,
     LoadingMaskComponent,
     PopupAlertComponent,
     TranslateModule,
@@ -34,6 +33,7 @@ import { CommonModule } from '@angular/common'
   standalone: true,
 })
 export class TableViewComponent {
+  @Input() cacheActive = true
   @Input() set link(value: DatasetOnlineResource) {
     this.currentLink$.next(value)
   }
@@ -45,25 +45,19 @@ export class TableViewComponent {
   tableData$ = this.currentLink$.pipe(
     switchMap((link) => {
       this.error = null
-      if (!link) return of([] as TableItemModel[])
+      if (!link) return of(undefined)
       this.loading = true
-      return this.fetchData(link).pipe(
-        map((items) =>
-          items.map((item) => ({
-            id: item.id,
-            ...item.properties,
-          }))
-        ),
+      return this.getDatasetReader(link).pipe(
         catchError((error) => {
           this.handleError(error)
-          return of([] as TableItemModel[])
+          return of(undefined)
         }),
         finalize(() => {
           this.loading = false
         })
       )
     }),
-    startWith([] as TableItemModel[]),
+    startWith(undefined),
     shareReplay(1)
   )
 
@@ -72,10 +66,8 @@ export class TableViewComponent {
     private translateService: TranslateService
   ) {}
 
-  fetchData(link: DatasetOnlineResource): Observable<DataItem[]> {
-    return this.dataService
-      .getDataset(link)
-      .pipe(switchMap((dataset) => dataset.read()))
+  getDatasetReader(link: DatasetOnlineResource): Observable<BaseReader> {
+    return this.dataService.getDataset(link, this.cacheActive)
   }
 
   onTableSelect(event) {

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

@@ -2,7 +2,7 @@
   <gn-ui-form-field-rich
     class="mt-[-8px]"
     [label]="label"
-    [hint]="hint | translate"
+    [placeholder]="hint | translate"
     [value]="constraint_.text ?? ''"
     (valueChange)="handleConstraintTextChange($event)"
   ></gn-ui-form-field-rich>

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

@@ -79,6 +79,7 @@ export class FormFieldContactsForResourceComponent
     'owner',
     'point_of_contact',
     'author',
+    'publisher',
   ]
 
   roleSectionsToDisplay: Role[] = []

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

@@ -28,7 +28,7 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
 export class FormFieldRichComponent {
   @Input() label: string
   @Input() hint: string
-  @Input() placeholder = 'Votre texte ici' //TODO: translate
+  @Input() placeholder = ''
   @Input() value: string
 
   @Output() valueChange: EventEmitter<string> = new EventEmitter()

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

@@ -16,19 +16,6 @@
         placeholder=""
       ></gn-ui-text-input>
     </div>
-    <div
-      class="flex-1 w-11/12"
-      *ngIf="wizardFieldType.CHIPS === wizardFieldConfig.type"
-    >
-      <gn-ui-chips-input
-        #chips
-        [selectedItems]="wizardFieldData"
-        placeholder=""
-        [id]="wizardFieldConfig.id"
-        [url]="wizardFieldConfig.options.url"
-        [loadOnce]="wizardFieldConfig.options.loadOnce"
-      ></gn-ui-chips-input>
-    </div>
     <div
       class="h-32 w-11/12"
       *ngIf="wizardFieldType.TEXT_AREA === wizardFieldConfig.type"

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

@@ -23,7 +23,6 @@ import { WizardFieldModel } from '../../models/wizard-field.model'
 import { WizardFieldType } from '../../models/wizard-field.type'
 import { WizardService } from '../../services/wizard.service'
 import {
-  ChipsInputComponent,
   DropdownSelectorComponent,
   TextAreaComponent,
   TextInputComponent,
@@ -74,7 +73,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
   @Input() wizardFieldConfig: WizardFieldModel
 
   @ViewChild('searchText') searchText: TextInputComponent
-  @ViewChild('chips') chips: ChipsInputComponent
   @ViewChild('textArea') textArea: TextAreaComponent
   @ViewChild('dropdown') dropdown: DropdownSelectorComponent
 
@@ -96,9 +94,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
       case WizardFieldType.TEXT: {
         return data || ''
       }
-      case WizardFieldType.CHIPS: {
-        return data ? JSON.parse(data) : []
-      }
       case WizardFieldType.TEXT_AREA: {
         return data || ''
       }
@@ -131,10 +126,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
         this.initializeTextInputListener()
         break
       }
-      case WizardFieldType.CHIPS: {
-        this.initializeChipsListener()
-        break
-      }
       case WizardFieldType.TEXT_AREA: {
         this.initializeTextAreaListener()
         return
@@ -161,17 +152,6 @@ export class WizardFieldComponent implements AfterViewInit, OnDestroy {
     )
   }
 
-  private initializeChipsListener() {
-    this.subs.add(
-      this.chips.itemsChange.subscribe((items) => {
-        this.wizardService.onWizardWizardFieldDataChanged(
-          this.wizardFieldConfig.id,
-          JSON.stringify(items)
-        )
-      })
-    )
-  }
-
   private initializeTextAreaListener() {
     this.subs.add(
       this.textArea.valueChange.subscribe((value) => {

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

@@ -275,8 +275,8 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       labelKey: marker('editor.record.form.page.description'),
       sections: [
         TITLE_SECTION,
-        ABOUT_SECTION,
         CLASSIFICATION_SECTION,
+        ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
     },

package/src/libs/feature/editor/src/lib/models/wizard-field.type.ts

@@ -1,7 +1,6 @@
 export enum WizardFieldType {
   TEXT,
   TEXT_AREA,
-  CHIPS,
   DATA_PICKER,
   DROPDOWN,
 }

package/src/libs/feature/record/src/lib/data-view/data-view.component.html

@@ -8,15 +8,28 @@
     [choices]="choices"
     (selectValue)="selectLink($event)"
   ></gn-ui-dropdown-selector>
-  <div class="relative h-[420px]">
-    <gn-ui-table-view
-      *ngIf="mode === 'table'"
-      [link]="selectedLink$ | async"
-    ></gn-ui-table-view>
-    <gn-ui-chart-view
-      *ngIf="mode === 'chart'"
-      (chartConfig$)="setChartConfig($event)"
-      [link]="selectedLink$ | async"
-    ></gn-ui-chart-view>
-  </div>
+  <ng-container *ngIf="hidePreview; else dataView">
+    <gn-ui-popup-alert
+      type="warning"
+      icon="matErrorOutlineOutline"
+      class="block h-12 p-1"
+    >
+      <span translate>record.feature.limit</span>
+    </gn-ui-popup-alert>
+  </ng-container>
+  <ng-template #dataView>
+    <div class="relative h-[460px]">
+      <gn-ui-table-view
+        *ngIf="mode === 'table'"
+        [cacheActive]="cacheActive$ | async"
+        [link]="selectedLink$ | async"
+      ></gn-ui-table-view>
+      <gn-ui-chart-view
+        *ngIf="mode === 'chart'"
+        (chartConfig$)="setChartConfig($event)"
+        [cacheActive]="cacheActive$ | async"
+        [link]="selectedLink$ | async"
+      ></gn-ui-chart-view>
+    </div>
+  </ng-template>
 </div>

package/src/libs/feature/record/src/lib/data-view/data-view.component.ts

@@ -5,8 +5,8 @@ import {
   Output,
 } from '@angular/core'
 import { getLinkLabel, getLinkPriority } from '../../../../../../libs/util/shared/src'
-import { BehaviorSubject, combineLatest } from 'rxjs'
-import { map, tap } from 'rxjs/operators'
+import { BehaviorSubject, combineLatest, of } from 'rxjs'
+import { catchError, finalize, map, switchMap, tap } from 'rxjs/operators'
 import { MdViewFacade } from '../state'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
@@ -17,6 +17,7 @@ import {
 } from '../../../../../../libs/feature/dataviz/src'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { PopupAlertComponent } from '../../../../../../libs/ui/widgets/src'
 
 @Component({
   selector: 'gn-ui-data-view',
@@ -30,12 +31,21 @@ import { TranslateModule } from '@ngx-translate/core'
     TableViewComponent,
     TranslateModule,
     ChartViewComponent,
+    PopupAlertComponent,
   ],
 })
 export class DataViewComponent {
   @Input() mode: 'table' | 'chart'
   @Input() displaySource = true
+  @Input() set exceedsLimit(value: boolean) {
+    this.excludeWfs$.next(value)
+  }
   @Output() chartConfig$ = new BehaviorSubject<DatavizConfigurationModel>(null)
+  cacheActive$ = this.mdViewFacade.isHighUpdateFrequency$.pipe(
+    map((highF) => !highF)
+  )
+  hidePreview = false
+  excludeWfs$ = new BehaviorSubject(false)
   compatibleDataLinks$ = combineLatest([
     this.mdViewFacade.dataLinks$,
     this.mdViewFacade.geoDataLinks$,
@@ -49,7 +59,7 @@ export class DataViewComponent {
   dropdownChoices$ = this.compatibleDataLinks$.pipe(
     tap((links) => {
       if (links.indexOf(this.selectedLink$.value) === -1) {
-        this.selectedLink$.next(links[0])
+        this.selectLink(JSON.stringify(links[0]))
       }
     }),
     map((links) =>
@@ -70,6 +80,18 @@ export class DataViewComponent {
   selectLink(linkAsString: string) {
     const link: DatasetOnlineResource = JSON.parse(linkAsString)
     link.url = new URL(link.url)
-    this.selectedLink$.next(link)
+    this.excludeWfs$
+      .pipe(
+        tap((excludeWfs) => {
+          this.hidePreview =
+            link['accessServiceProtocol'] === 'wfs' &&
+            excludeWfs &&
+            this.mode === 'chart'
+              ? true
+              : false
+          this.selectedLink$.next(link)
+        })
+      )
+      .subscribe()
   }
 }

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

@@ -4,7 +4,10 @@ import { StoreModule } from '@ngrx/store'
 import { EffectsModule } from '@ngrx/effects'
 import { UiLayoutModule } from '../../../../../libs/ui/layout/src'
 import { FeatureMapModule } from '../../../../../libs/feature/map/src'
-import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
+import {
+  DropdownSelectorComponent,
+  UiInputsModule,
+} from '../../../../../libs/ui/inputs/src'
 import { UiElementsModule } from '../../../../../libs/ui/elements/src'
 import { MdViewFacade } from './state'
 import { MdViewEffects } from './state/mdview.effects'
@@ -16,9 +19,8 @@ import { MatTabsModule } from '@angular/material/tabs'
 import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { TranslateModule } from '@ngx-translate/core'
 import { FeatureCatalogModule } from '../../../../../libs/feature/catalog/src'
-import { TableComponent } from '../../../../../libs/ui/dataviz/src'
+import { DataTableComponent } from '../../../../../libs/ui/dataviz/src'
 import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
-import { DropdownSelectorComponent } from '../../../../../libs/ui/inputs/src'
 
 @NgModule({
   imports: [
@@ -33,7 +35,7 @@ import { DropdownSelectorComponent } from '../../../../../libs/ui/inputs/src'
     MatTabsModule,
     UiWidgetsModule,
     TranslateModule,
-    TableComponent,
+    DataTableComponent,
     NgIconsModule,
     DropdownSelectorComponent,
   ],