geonetwork-ui 2.4.2 → 2.4.4-dev.9094d472a

package/src/libs/ui/dataviz/src/lib/data-table/data-table.component.ts

@@ -0,0 +1,173 @@
+import { ScrollingModule } from '@angular/cdk/scrolling'
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core'
+import { MatSort, MatSortModule } from '@angular/material/sort'
+import { MatTableModule } from '@angular/material/table'
+import { TranslateModule, TranslateService } from '@ngx-translate/core'
+import { DataTableDataSource } from './data-table.data.source'
+import { BaseReader, FetchError } from '../../../../../../libs/util/data-fetcher/src'
+import {
+  MatPaginator,
+  MatPaginatorIntl,
+  MatPaginatorModule,
+} from '@angular/material/paginator'
+import { CustomMatPaginatorIntl } from './custom.mat.paginator.intl'
+import { CommonModule } from '@angular/common'
+import { BehaviorSubject, filter, firstValueFrom } from 'rxjs'
+import {
+  LoadingMaskComponent,
+  PopupAlertComponent,
+} from '../../../../../../libs/ui/widgets/src'
+import { LetDirective } from '@ngrx/component'
+
+const rowIdPrefix = 'table-item-'
+
+export type TableItemId = string | number
+type TableItemType = string | number | Date
+
+export interface TableItemModel {
+  id: TableItemId
+  [key: string]: TableItemType
+}
+
+@Component({
+  standalone: true,
+  imports: [
+    MatTableModule,
+    MatSortModule,
+    MatPaginatorModule,
+    ScrollingModule,
+    TranslateModule,
+    CommonModule,
+    LoadingMaskComponent,
+    PopupAlertComponent,
+    LetDirective,
+  ],
+  providers: [{ provide: MatPaginatorIntl, useClass: CustomMatPaginatorIntl }],
+  selector: 'gn-ui-data-table',
+  templateUrl: './data-table.component.html',
+  styleUrls: ['./data-table.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DataTableComponent implements OnInit, AfterViewInit, OnChanges {
+  @Input() set dataset(value: BaseReader) {
+    this.properties$.next(null)
+    this.dataset_ = value
+    this.dataset_.load()
+    this.dataset_.properties.then((properties) =>
+      this.properties$.next(properties.map((p) => p.name))
+    )
+    this.dataset_.info.then((info) => (this.count = info.itemsCount))
+  }
+  @Input() activeId: TableItemId
+  @Output() selected = new EventEmitter<any>()
+
+  @ViewChild(MatSort) sort: MatSort
+  @ViewChild(MatPaginator) paginator: MatPaginator
+
+  dataset_: BaseReader
+  properties$ = new BehaviorSubject<string[]>(null)
+  dataSource: DataTableDataSource
+  headerHeight: number
+  count: number
+  loading$ = new BehaviorSubject<boolean>(false)
+  error = null
+
+  constructor(
+    private eltRef: ElementRef,
+    private cdr: ChangeDetectorRef,
+    private translateService: TranslateService
+  ) {}
+
+  ngOnInit() {
+    this.dataSource = new DataTableDataSource()
+  }
+
+  ngAfterViewInit() {
+    this.headerHeight =
+      this.eltRef.nativeElement.querySelector('thead').offsetHeight
+    this.setPagination()
+    this.cdr.detectChanges()
+  }
+
+  ngOnChanges() {
+    this.setPagination()
+  }
+
+  setSort(sort: MatSort) {
+    if (!this.dataset_) return
+    if (!sort.active) {
+      this.dataset_.orderBy()
+    } else {
+      this.dataset_.orderBy([sort.direction || 'asc', sort.active])
+    }
+    this.readData()
+  }
+
+  setPagination() {
+    if (!this.paginator) return
+    if (!this.dataset_) return
+    this.dataset_.limit(
+      this.paginator.pageIndex * this.paginator.pageSize,
+      this.paginator.pageSize
+    )
+    this.readData()
+  }
+
+  async readData() {
+    this.loading$.next(true)
+    // wait for properties to be read
+    const properties = await firstValueFrom(
+      this.properties$.pipe(filter((p) => !!p))
+    )
+    const propsWithoutGeom = properties.filter(
+      (p) => !p.toLowerCase().startsWith('geom')
+    )
+    this.dataset_.select(...propsWithoutGeom)
+    try {
+      await this.dataSource.showData(this.dataset_.read())
+      this.error = null
+    } catch (error) {
+      this.handleError(error as FetchError | Error)
+    }
+    this.loading$.next(false)
+  }
+
+  scrollToItem(itemId: TableItemId): void {
+    const row = this.eltRef.nativeElement.querySelector(
+      `#${this.getRowEltId(itemId)}`
+    )
+    this.eltRef.nativeElement.scrollTop = row.offsetTop - this.headerHeight
+  }
+
+  public getRowEltId(id: TableItemId): string {
+    return rowIdPrefix + id
+  }
+
+  handleError(error: FetchError | Error) {
+    this.dataSource.clearData()
+    if (error instanceof FetchError) {
+      this.error = this.translateService.instant(
+        `dataset.error.${error.type}`,
+        {
+          info: error.info,
+        }
+      )
+      console.warn(error.message)
+    } else {
+      this.error = this.translateService.instant(error.message)
+      console.warn(error.stack || error)
+    }
+  }
+}

package/src/libs/ui/dataviz/src/lib/data-table/data-table.data.source.ts

@@ -0,0 +1,33 @@
+import { DataSource } from '@angular/cdk/collections'
+import { BehaviorSubject, Observable } from 'rxjs'
+import { DataItem } from '../../../../../../libs/util/data-fetcher/src'
+import { map } from 'rxjs/operators'
+import { TableItemModel } from './data-table.component'
+
+export class DataTableDataSource implements DataSource<TableItemModel> {
+  private dataItems$ = new BehaviorSubject<DataItem[]>([])
+
+  connect(): Observable<TableItemModel[]> {
+    return this.dataItems$.asObservable().pipe(
+      map((items) =>
+        items.map((item) => ({
+          id: item.id,
+          ...item.properties,
+        }))
+      )
+    )
+  }
+
+  disconnect(): void {
+    this.dataItems$.complete()
+  }
+
+  async showData(itemsPromise: Promise<DataItem[]>) {
+    const items = await itemsPromise
+    this.dataItems$.next(items)
+  }
+
+  clearData() {
+    this.dataItems$.next([])
+  }
+}

package/src/libs/ui/dataviz/src/lib/data-table/data-table.fixtures.ts

@@ -0,0 +1,84 @@
+import { DataItem, PropertyInfo } from '../../../../../../libs/util/data-fetcher/src'
+
+export const tableItemsFixture = {
+  items: [
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '0001',
+        firstName: 'John',
+        lastName: 'Lennon',
+      },
+    },
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '0002',
+        firstName: 'Ozzy',
+        lastName: 'Osbourne',
+      },
+    },
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '0003',
+        firstName: 'Claude',
+        lastName: 'François',
+      },
+    },
+  ] as DataItem[],
+  properties: [
+    { name: 'id', label: 'id', type: 'string' },
+    { name: 'firstName', label: 'Firstname', type: 'string' },
+    { name: 'lastName', label: 'Lastname', type: 'string' },
+  ] as PropertyInfo[],
+}
+
+export const someHabTableItemFixture = {
+  items: [
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '1',
+        name: 'France',
+        pop: 50500000,
+      },
+    },
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '2',
+        name: 'Italy',
+        pop: 155878789655,
+      },
+    },
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '3',
+        name: 'UK',
+        pop: 31522456,
+      },
+    },
+    {
+      type: 'Feature',
+      geometry: null,
+      properties: {
+        id: '4',
+        name: 'US',
+        pop: 3215448888,
+      },
+    },
+  ] as DataItem[],
+  properties: [
+    { name: 'id', label: 'ID', type: 'string' },
+    { name: 'name', label: 'Name', type: 'string' },
+    { name: 'pop', label: 'Population', type: 'number' },
+  ] as PropertyInfo[],
+}

package/src/libs/ui/elements/src/index.ts

@@ -22,3 +22,4 @@ export * from './lib/thumbnail/thumbnail.component'
 export * from './lib/ui-elements.module'
 export * from './lib/user-feedback-item/user-feedback-item.component'
 export * from './lib/user-preview/user-preview.component'
+export * from './lib/application-banner/application-banner.component'

package/src/libs/ui/elements/src/lib/application-banner/application-banner.component.html

@@ -0,0 +1,25 @@
+<div
+  *ngIf="message && bannerOpen"
+  class="absolute top-0 text-wrap bg-white mt-4 max-h-24"
+>
+  <div
+    class="flex flex-row py-2.5 px-5 gap-5 justify-start border max-h-20"
+    [ngClass]="classList"
+  >
+    <div [ngClass]="{ 'pt-5': message.length > 200 }">
+      <ng-icon [name]="icon"></ng-icon>
+    </div>
+    <div class="flex flex-col justify-start gap-2.5">
+      <span *ngIf="title" class="font-bold">{{ title }}</span>
+      <span class="font-medium max-w-2xl" [innerHTML]="message"></span>
+    </div>
+    <button
+      *ngIf="closeEnabled"
+      class="self-start"
+      type="button"
+      (click)="closeMessage()"
+    >
+      <ng-icon name="matCloseOutline"> </ng-icon>
+    </button>
+  </div>
+</div>

package/src/libs/ui/elements/src/lib/application-banner/application-banner.component.ts

@@ -0,0 +1,70 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import {
+  matCloseOutline,
+  matInfoOutline,
+  matWarningAmberOutline,
+} from '@ng-icons/material-icons/outline'
+import { matWarning } from '@ng-icons/material-icons/baseline'
+
+@Component({
+  selector: 'gn-ui-application-banner',
+  standalone: true,
+  imports: [CommonModule, NgIconComponent],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  templateUrl: './application-banner.component.html',
+  styleUrl: './application-banner.component.css',
+  providers: [
+    provideIcons({
+      matWarningAmberOutline,
+      matInfoOutline,
+      matCloseOutline,
+      matWarning,
+    }),
+    provideNgIconsConfig({ size: '1.5em' }),
+  ],
+})
+export class ApplicationBannerComponent {
+  @Input() message: string
+  @Input() title: string
+  @Input() closeEnabled = false
+  @Input() extraClass = ''
+  @Input() icon = ''
+  msgClass = ''
+  bannerOpen = true
+
+  @Input() set type(value: 'primary' | 'secondary' | 'light') {
+    switch (value) {
+      case 'primary':
+        this.msgClass = 'bg-primary-darkest border-primary text-white'
+        this.icon = 'matWarning'
+        break
+      case 'light':
+        this.msgClass =
+          'bg-primary-opacity-10 border-primary-lightest text-black'
+        this.icon = 'matInfoOutline'
+        break
+      case 'secondary':
+      default:
+        this.msgClass = 'bg-primary-opacity-50 border-primary-darker text-black'
+        this.icon = 'matWarningAmberOutline'
+        break
+    }
+  }
+
+  get classList() {
+    if (this.message.length > 200) {
+      return `${this.msgClass} ${this.extraClass} overflow-y-scroll items-start`
+    }
+    return `${this.msgClass} ${this.extraClass} items-center`
+  }
+
+  closeMessage() {
+    this.bannerOpen = false
+  }
+}

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { marked } from 'marked'
 
 @Component({
@@ -13,6 +13,6 @@ export class MarkdownParserComponent {
   @Input() whitoutStyles?: boolean
 
   get parsedMarkdown() {
-    return marked.parse(this.textContent)
+    return marked.parse(this.textContent ?? '')
   }
 }

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -163,13 +163,13 @@
     <div *ngIf="metadata.resourceCreated">
       <p class="text-sm" translate>record.metadata.creation</p>
       <p class="text-primary font-medium mt-1">
-        {{ metadata.resourceCreated.toLocaleDateString() }}
+        {{ formatDate(metadata.resourceCreated) }}
       </p>
     </div>
     <div *ngIf="metadata.resourcePublished">
       <p class="text-sm" translate>record.metadata.publication</p>
       <p class="text-primary font-medium mt-1">
-        {{ metadata.resourcePublished.toLocaleDateString() }}
+        {{ formatDate(metadata.resourcePublished) }}
       </p>
     </div>
     <div *ngIf="updateFrequency">
@@ -233,7 +233,7 @@
     <div *ngIf="metadata.recordUpdated">
       <p class="text-sm" translate>record.metadata.updatedOn</p>
       <p class="text-primary font-medium">
-        {{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}
+        {{ metadata.recordUpdated && formatDateTime(metadata.recordUpdated) }}
       </p>
     </div>
     <div *ngIf="metadata.landingPage">

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -9,7 +9,7 @@ import {
   DatasetRecord,
   Keyword,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
-import { getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
+import { DateService, getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
 import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
 import {
   ExpandablePanelComponent,
@@ -60,6 +60,8 @@ export class MetadataInfoComponent {
   @Output() keyword = new EventEmitter<Keyword>()
   updatedTimes: number
 
+  constructor(private dateService: DateService) {}
+
   get hasUsage() {
     return (
       this.metadata.extras?.isOpenData === true ||
@@ -121,7 +123,7 @@ export class MetadataInfoComponent {
 
   get temporalExtent(): { start: string; end: string } {
     const temporalExtents = this.metadata.temporalExtents
-    return getTemporalRangeUnion(temporalExtents)
+    return getTemporalRangeUnion(temporalExtents, this.dateService)
   }
 
   get shownOrganization() {
@@ -139,4 +141,12 @@ export class MetadataInfoComponent {
   onKeywordClick(keyword: Keyword) {
     this.keyword.emit(keyword)
   }
+
+  formatDate(date: Date): string {
+    return this.dateService.formatDate(date)
+  }
+
+  formatDateTime(date: Date): string {
+    return this.dateService.formatDateTime(date)
+  }
 }

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts

@@ -161,6 +161,8 @@ export class RecordApiFormComponent {
       maxFeatures: limit !== '-1' ? Number(limit) : undefined,
       limit: limit !== '-1' ? Number(limit) : -1,
       offset: offset !== '' ? Number(offset) : undefined,
+      outputCrs:
+        format === ('application/json' || 'geojson') ? 'EPSG:4326' : undefined,
     }
 
     if (this.endpoint instanceof WfsEndpoint) {

package/src/libs/ui/elements/src/lib/ui-elements.module.ts

@@ -19,6 +19,7 @@ import { MarkdownParserComponent } from './markdown-parser/markdown-parser.compo
 import { ThumbnailComponent } from './thumbnail/thumbnail.component'
 import { TimeSincePipe } from './user-feedback-item/time-since.pipe'
 import { UserPreviewComponent } from './user-preview/user-preview.component'
+import { ApplicationBannerComponent } from './application-banner/application-banner.component'
 
 @NgModule({
   imports: [
@@ -40,6 +41,7 @@ import { UserPreviewComponent } from './user-preview/user-preview.component'
     MaxLinesComponent,
     TextInputComponent,
     ImageInputComponent,
+    ApplicationBannerComponent,
   ],
   providers: [
     provideNgIconsConfig({
@@ -53,6 +55,7 @@ import { UserPreviewComponent } from './user-preview/user-preview.component'
     UserPreviewComponent,
     MarkdownParserComponent,
     ImageInputComponent,
+    ApplicationBannerComponent,
   ],
 })
 export class UiElementsModule {}

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts

@@ -147,6 +147,12 @@ export class AutocompleteComponent
         this.error = null
       }),
       switchMap((value) => this.action(value)),
+      tap((suggestions) => {
+        // forcing the panel to open if there are suggestions
+        if (suggestions.length > 0) {
+          this.triggerRef?.openPanel()
+        }
+      }),
       catchError((error: Error) => {
         this.error = error.message
         return of([])

package/src/libs/ui/search/src/lib/results-table/results-table.component.ts

@@ -21,6 +21,7 @@ import {
   InteractiveTableComponent,
 } from '../../../../../../libs/ui/layout/src'
 import {
+  DateService,
   FileFormat,
   formatUserInfo,
   getBadgeColor,
@@ -86,7 +87,8 @@ export class ResultsTableComponent {
   constructor(
     private overlay: Overlay,
     private viewContainerRef: ViewContainerRef,
-    private cdr: ChangeDetectorRef
+    private cdr: ChangeDetectorRef,
+    private dateService: DateService
   ) {}
 
   openActionMenu(item, template) {
@@ -139,7 +141,7 @@ export class ResultsTableComponent {
   }
 
   dateToString(date: Date): string {
-    return date?.toLocaleDateString(undefined, {
+    return this.dateService.formatDate(date, {
       year: 'numeric',
       month: 'long',
       day: 'numeric',

package/src/libs/util/data-fetcher/src/index.ts

@@ -5,6 +5,9 @@ export {
   DataItem,
   FetchError,
   FieldAggregation,
+  PropertyInfo,
 } from './lib/model'
 export { getJsonDataItemsProxy } from './lib/utils'
 export { BaseReader } from './lib/readers/base'
+export { BaseFileReader } from './lib/readers/base-file'
+export { GeojsonReader } from './lib/readers/geojson'

package/src/libs/util/data-fetcher/src/lib/data-fetcher.ts

@@ -17,10 +17,17 @@ export async function openDataset(
     namespace?: string
     wfsVersion?: WfsVersion
     wfsFeatureType?: string
-  }
+  },
+  cacheActive?: boolean
 ): Promise<BaseReader> {
   const fileType = await inferDatasetType(url, typeHint)
-  let reader: BaseReader
+  let reader:
+    | CsvReader
+    | JsonReader
+    | GeojsonReader
+    | ExcelReader
+    | GmlReader
+    | WfsReader
   try {
     switch (fileType) {
       case 'csv':
@@ -42,6 +49,7 @@ export async function openDataset(
         reader = await WfsReader.createReader(url, options.wfsFeatureType)
         break
     }
+    reader.setCacheActive(cacheActive)
     reader.load()
     return reader
   } catch (e: any) {
@@ -61,9 +69,10 @@ export async function openDataset(
 export async function readDataset(
   url: string,
   typeHint?: SupportedType,
-  options?: any
+  options?: any,
+  cacheActive = true
 ): Promise<DataItem[]> {
-  const reader = await openDataset(url, typeHint, options)
+  const reader = await openDataset(url, typeHint, options, cacheActive)
   try {
     return await reader.read()
   } catch (e: any) {

package/src/libs/util/data-fetcher/src/lib/model.ts

@@ -13,8 +13,12 @@ export class FetchError {
   ) {
     this.message = `An error happened in the data fetcher, type: ${type}, info: ${info}`
   }
-  static http(code: number) {
-    return new FetchError('http', '', code)
+  static http(code: number, body?: string) {
+    const info = body
+      ? `Error ${code}
+${body}`
+      : `${code}`
+    return new FetchError('http', info, code)
   }
   static corsOrNetwork(message: string) {
     return new FetchError('network', message, 0)

package/src/libs/util/data-fetcher/src/lib/readers/base-cache.ts

@@ -0,0 +1,14 @@
+import { BaseReader } from './base'
+
+export abstract class BaseCacheReader extends BaseReader {
+  constructor(
+    protected url: string,
+    protected cacheActive = true
+  ) {
+    super(url)
+  }
+
+  setCacheActive(value: boolean) {
+    this.cacheActive = value
+  }
+}

package/src/libs/util/data-fetcher/src/lib/readers/base-file.ts

@@ -2,13 +2,14 @@ import { BaseReader } from './base'
 import { DataItem, DatasetInfo, PropertyInfo } from '../model'
 import { getJsonDataItemsProxy, jsonToGeojsonFeature } from '../utils'
 import { generateSqlQuery } from '../sql-utils'
+import { BaseCacheReader } from './base-cache'
 
 type ParseResult = {
   items: DataItem[]
   properties: PropertyInfo[]
 }
 
-export class BaseFileReader extends BaseReader {
+export class BaseFileReader extends BaseCacheReader {
   private parseResult_: Promise<ParseResult>
 
   protected getData(): Promise<ParseResult> {

package/src/libs/util/data-fetcher/src/lib/readers/base.ts

@@ -11,8 +11,8 @@ import {
 
 export class BaseReader {
   protected selected: FieldName[] = null
-  protected groupedBy: FieldGroupBy[] = null
-  protected aggregations: FieldAggregation[] = null
+  public groupedBy: FieldGroupBy[] = null
+  public aggregations: FieldAggregation[] = null
   protected filter: FieldFilter = null
   protected sort: FieldSort[] = null
   protected startIndex: number = null

package/src/libs/util/data-fetcher/src/lib/readers/csv.ts

@@ -47,6 +47,6 @@ export function parseCsv(text: string): {
 
 export class CsvReader extends BaseFileReader {
   getData() {
-    return fetchDataAsText(this.url).then(parseCsv)
+    return fetchDataAsText(this.url, this.cacheActive).then(parseCsv)
   }
 }

package/src/libs/util/data-fetcher/src/lib/readers/excel.ts

@@ -28,6 +28,6 @@ export function parseExcel(buffer: ArrayBuffer): Promise<{
 
 export class ExcelReader extends BaseFileReader {
   getData() {
-    return fetchDataAsArrayBuffer(this.url).then(parseExcel)
+    return fetchDataAsArrayBuffer(this.url, this.cacheActive).then(parseExcel)
   }
 }