geonetwork-ui 2.5.0-dev.bd37f68b3 → 2.5.0-dev.caf47b863

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

@@ -164,18 +164,26 @@ export class DataService {
       wfsLink.url.toString(),
       wfsLink.name
     ).pipe(
-      map((urls) => urls.all),
-      map((urls) =>
-        Object.keys(urls).map((format) => ({
-          ...wfsLink,
-          name: wfsLink.name,
-          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
+      })
     )
   }
 
@@ -234,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',
@@ -244,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())
@@ -259,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'
@@ -268,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'
@@ -276,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.ts

@@ -33,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)
   }
@@ -66,7 +67,7 @@ export class TableViewComponent {
   ) {}
 
   getDatasetReader(link: DatasetOnlineResource): Observable<BaseReader> {
-    return this.dataService.getDataset(link)
+    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/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/record/src/lib/data-view/data-view.component.html

@@ -11,11 +11,13 @@
   <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>

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

@@ -36,6 +36,9 @@ export class DataViewComponent {
   @Input() mode: 'table' | 'chart'
   @Input() displaySource = true
   @Output() chartConfig$ = new BehaviorSubject<DatavizConfigurationModel>(null)
+  cacheActive$ = this.mdViewFacade.isHighUpdateFrequency$.pipe(
+    map((highF) => !highF)
+  )
   compatibleDataLinks$ = combineLatest([
     this.mdViewFacade.dataLinks$,
     this.mdViewFacade.geoDataLinks$,

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

@@ -239,7 +239,8 @@ export class MapViewComponent implements AfterViewInit {
           link.accessServiceProtocol === 'ogcFeatures')) ||
       link.type === 'download'
     ) {
-      return this.dataService.readAsGeoJson(link).pipe(
+      const cacheActive = true // TODO implement whether should be true or false
+      return this.dataService.readAsGeoJson(link, cacheActive).pipe(
         map((data) => ({
           type: 'geojson',
           data,

package/src/libs/feature/record/src/lib/state/mdview.actions.ts

@@ -2,6 +2,7 @@ import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/
 import { createAction, props } from '@ngrx/store'
 import {
   CatalogRecord,
+  DatasetFeatureCatalog,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -28,6 +29,21 @@ export const loadFullMetadataFailure = createAction(
   props<{ otherError?: string; notFound?: boolean }>()
 )
 
+export const loadFeatureCatalog = createAction(
+  "[Metadata view] Load metadata's feature catalog",
+  props<{ metadata: CatalogRecord }>()
+)
+
+export const loadFeatureCatalogSuccess = createAction(
+  '[Metadata view] Load metadata feature catalog success',
+  props<{ datasetCatalog: DatasetFeatureCatalog | null }>()
+)
+
+export const loadFeatureCatalogFailure = createAction(
+  '[Metadata view] Load metadata feature catalog failure',
+  props<{ error?: string }>()
+)
+
 export const closeMetadata = createAction('[Metadata view] close')
 
 /*

package/src/libs/feature/record/src/lib/state/mdview.effects.ts

@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { exhaustMap, mergeMap, of } from 'rxjs'
-import { catchError, map, switchMap } from 'rxjs/operators'
+import { catchError, filter, map, switchMap, take } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
-
 @Injectable()
 export class MdViewEffects {
   constructor(
@@ -33,6 +32,26 @@ export class MdViewEffects {
     )
   )
 
+  loadFeatureCatalog$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(MdViewActions.loadFullMetadataSuccess),
+      filter(({ full }) => full !== undefined),
+      switchMap(({ full }) => this.recordsRepository.getFeatureCatalog(full)),
+      map((featureCatalog) =>
+        MdViewActions.loadFeatureCatalogSuccess({
+          datasetCatalog: featureCatalog,
+        })
+      ),
+      catchError((error) =>
+        of(
+          MdViewActions.loadFeatureCatalogFailure({
+            error: error.message,
+          })
+        )
+      )
+    )
+  )
+
   /*
     Related effects
   */

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -52,11 +52,26 @@ export class MdViewFacade {
     filter((md) => !!md)
   )
 
+  featureCatalog$ = this.store.pipe(select(MdViewSelectors.getFeatureCatalog))
+
   isIncomplete$ = this.store.pipe(
     select(MdViewSelectors.getMetadataIsIncomplete),
     filter((incomplete) => incomplete !== null)
   )
 
+  isHighUpdateFrequency$ = this.metadata$.pipe(
+    map((record) => {
+      if (record.updateFrequency instanceof Object) {
+        return (
+          record.updateFrequency.per === 'day' &&
+          record.updateFrequency.updatedTimes > 1
+        )
+      }
+
+      return record.updateFrequency === 'continual'
+    })
+  )
+
   error$ = this.store.pipe(select(MdViewSelectors.getMetadataError))
 
   related$ = this.store.pipe(select(MdViewSelectors.getRelated))

package/src/libs/feature/record/src/lib/state/mdview.reducer.ts

@@ -3,6 +3,7 @@ import * as MetadataViewActions from './mdview.actions'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import {
   CatalogRecord,
+  DatasetFeatureCatalog,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -17,6 +18,9 @@ export interface MetadataViewState {
   allUserFeedbacksLoading: boolean
   addUserFeedbackLoading: boolean
   chartConfig?: DatavizConfigurationModel
+  featureCatalog?: DatasetFeatureCatalog
+  featureCatalogLoading: boolean
+  featureCatalogError: string | null
 }
 
 export const initialMetadataViewState: MetadataViewState = {
@@ -24,6 +28,8 @@ export const initialMetadataViewState: MetadataViewState = {
   loadingFull: false,
   allUserFeedbacksLoading: false,
   addUserFeedbackLoading: false,
+  featureCatalogLoading: false,
+  featureCatalogError: null,
 }
 
 const metadataViewReducer = createReducer(
@@ -105,7 +111,30 @@ const metadataViewReducer = createReducer(
       addUserFeedbackLoading: false,
       allUserFeedbacksLoading: false,
     })
-  )
+  ),
+
+  /**
+   * FeatureCatalog reducers
+   */
+
+  on(MetadataViewActions.loadFeatureCatalog, (state) => ({
+    ...state,
+    featureCatalogError: null,
+    featureCatalogLoading: true,
+  })),
+  on(
+    MetadataViewActions.loadFeatureCatalogSuccess,
+    (state, { datasetCatalog }) => ({
+      ...state,
+      featureCatalog: datasetCatalog,
+      featureCatalogLoading: false,
+    })
+  ),
+  on(MetadataViewActions.loadFeatureCatalogFailure, (state, { error }) => ({
+    ...state,
+    featureCatalogError: error,
+    featureCatalogLoading: false,
+  }))
 )
 
 export function reducer(

package/src/libs/feature/record/src/lib/state/mdview.selectors.ts

@@ -64,3 +64,15 @@ export const getAddUserFeedbacksLoading = createSelector(
   getMdViewState,
   (state: MetadataViewState) => state.addUserFeedbackLoading
 )
+
+/*
+  Feature Catalog Selectors
+*/
+export const getFeatureCatalog = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.featureCatalog
+)
+export const getFeatureCatalogIsLoading = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.featureCatalogLoading
+)

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -1,6 +1,7 @@
 import { Injectable, Injector } from '@angular/core'
 import {
   AbstractSearchField,
+  AvailableServicesField,
   DateRangeSearchField,
   FieldValue,
   FullTextSearchField,
@@ -91,6 +92,7 @@ export class FieldsService {
     ),
     user: new UserSearchField(this.injector),
     changeDate: new DateRangeSearchField('changeDate', this.injector, 'desc'),
+    availableServices: new AvailableServicesField(this.injector),
   } as Record<string, AbstractSearchField>
 
   get supportedFields() {

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -9,6 +9,7 @@ import { PlatformServiceInterface } from '../../../../../../../libs/common/domai
 import {
   AggregationBuckets,
   AggregationsParams,
+  FieldFilter,
   FieldFilterByExpression,
   FieldFilters,
   TermBucket,
@@ -425,3 +426,57 @@ export class DateRangeSearchField extends SimpleSearchField {
     return 'dateRange'
   }
 }
+
+marker('search.filters.availableServices.view')
+marker('search.filters.availableServices.download')
+
+export class AvailableServicesField extends SimpleSearchField {
+  private translateService = this.injector.get(TranslateService)
+
+  constructor(injector: Injector) {
+    super('availableServices', injector, 'asc')
+  }
+
+  linkProtocolViewFilter = '/OGC:WMT?S.*/'
+  linkProtocolDownloadFilter = '/OGC:WFS.*/'
+
+  protected async getBucketLabel(bucket: TermBucket) {
+    return firstValueFrom(
+      this.translateService.get(
+        `search.filters.availableServices.${bucket.term}`
+      )
+    )
+  }
+
+  protected getAggregations(): AggregationsParams {
+    return {
+      availableServices: {
+        type: 'filters',
+        filters: {
+          view: `+linkProtocol:${this.linkProtocolViewFilter}`,
+          download: `+linkProtocol:${this.linkProtocolDownloadFilter}`,
+        },
+      },
+    }
+  }
+
+  getFiltersForValues(values: FieldValue[]): Observable<FieldFilters> {
+    const filters: FieldFilter = {}
+    if (values.includes('view')) filters[this.linkProtocolViewFilter] = true
+    if (values.includes('download'))
+      filters[this.linkProtocolDownloadFilter] = true
+
+    return of({
+      linkProtocol: filters,
+    })
+  }
+
+  getValuesForFilter(filters: FieldFilters): Observable<FieldValue[]> {
+    const linkFilter = filters.linkProtocol
+    if (!linkFilter) return of([])
+    const values = []
+    if (linkFilter[this.linkProtocolViewFilter]) values.push('view')
+    if (linkFilter[this.linkProtocolDownloadFilter]) values.push('download')
+    return of(values)
+  }
+}

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 left-0 right-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]="message.length > 200 ? 'pt-5' : 'pt-1'">
+      <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/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([])