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

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

@@ -14,80 +14,91 @@
     >
     </gn-ui-external-viewer-button>
   </div>
-  <div
-    class="relative w-full h-full bg-white border border-gray-300 rounded-lg overflow-hidden"
-  >
-    <gn-ui-map-container
-      #mapContainer
-      [context]="mapContext$ | async"
-      (featuresClick)="onMapFeatureSelect($event)"
-    ></gn-ui-map-container>
-    <div
-      class="top-[1em] right-[1em] p-3 bg-white absolute overflow-y-auto overflow-x-hidden max-h-72 w-56"
-      [class.hidden]="!selection"
+  <ng-container *ngIf="hidePreview; else mapView">
+    <gn-ui-popup-alert
+      type="warning"
+      icon="matErrorOutlineOutline"
+      class="block h-12 p-1"
     >
-      <gn-ui-button
-        type="light"
-        (buttonClick)="resetSelection()"
-        style="
-          --gn-ui-button-padding: 0px;
-          --gn-ui-button-width: 24px;
-          --gn-ui-button-height: 24px;
-        "
-        extraClass="absolute right-[0.5em] ml-[8px] mr-[10px]"
-      >
-        <ng-icon name="matClose" class="align-middle text-sm"></ng-icon>
-      </gn-ui-button>
-      <gn-ui-feature-detail [feature]="selection"></gn-ui-feature-detail>
-    </div>
-
+      <span translate>record.feature.limit</span>
+    </gn-ui-popup-alert>
+  </ng-container>
+  <ng-template #mapView>
     <div
-      class="top-[1em] p-3 bg-white absolute overflow-y-auto overflow-x-hidden max-h-72 w-56"
-      [ngClass]="{ 'right-[1em]': !selection, 'right-[16em]': selection }"
-      [hidden]="!showLegend || !legendExists"
+      class="relative w-full h-full bg-white border border-gray-300 rounded-lg overflow-hidden"
     >
-      <div class="flex justify-between items-center mb-2">
-        <div class="text-primary font-bold">Legend</div>
+      <gn-ui-map-container
+        #mapContainer
+        [context]="mapContext$ | async"
+        (featuresClick)="onMapFeatureSelect($event)"
+      ></gn-ui-map-container>
+      <div
+        class="top-[1em] right-[1em] p-3 bg-white absolute overflow-y-auto overflow-x-hidden max-h-72 w-56"
+        [class.hidden]="!selection"
+      >
         <gn-ui-button
           type="light"
-          (buttonClick)="toggleLegend()"
+          (buttonClick)="resetSelection()"
           style="
             --gn-ui-button-padding: 0px;
             --gn-ui-button-width: 24px;
             --gn-ui-button-height: 24px;
           "
-          extraClass="ml-[8px] mr-[10px]"
+          extraClass="absolute right-[0.5em] ml-[8px] mr-[10px]"
         >
           <ng-icon name="matClose" class="align-middle text-sm"></ng-icon>
         </gn-ui-button>
+        <gn-ui-feature-detail [feature]="selection"></gn-ui-feature-detail>
       </div>
-      <gn-ui-map-legend
-        [context]="mapContext$ | async"
-        (legendStatusChange)="onLegendStatusChange($event)"
-      ></gn-ui-map-legend>
-    </div>
 
-    <gn-ui-button
-      *ngIf="!showLegend && legendExists && !selection"
-      type="outline"
-      (buttonClick)="toggleLegend()"
-      extraClass="absolute top-[1em] right-[1em] rounded p-1 text-xs bg-white"
-    >
-      Legend
-    </gn-ui-button>
+      <div
+        class="top-[1em] p-3 bg-white absolute overflow-y-auto overflow-x-hidden max-h-72 w-56"
+        [ngClass]="{ 'right-[1em]': !selection, 'right-[16em]': selection }"
+        [hidden]="!showLegend || !legendExists"
+      >
+        <div class="flex justify-between items-center mb-2">
+          <div class="text-primary font-bold">Legend</div>
+          <gn-ui-button
+            type="light"
+            (buttonClick)="toggleLegend()"
+            style="
+              --gn-ui-button-padding: 0px;
+              --gn-ui-button-width: 24px;
+              --gn-ui-button-height: 24px;
+            "
+            extraClass="ml-[8px] mr-[10px]"
+          >
+            <ng-icon name="matClose" class="align-middle text-sm"></ng-icon>
+          </gn-ui-button>
+        </div>
+        <gn-ui-map-legend
+          [context]="mapContext$ | async"
+          (legendStatusChange)="onLegendStatusChange($event)"
+        ></gn-ui-map-legend>
+      </div>
 
-    <gn-ui-loading-mask
-      *ngIf="loading"
-      class="absolute inset-0"
-      [message]="'map.loading.data' | translate"
-    ></gn-ui-loading-mask>
-    <gn-ui-popup-alert
-      *ngIf="error"
-      type="warning"
-      icon="matErrorOutlineOutline"
-      class="absolute m-2 inset-0"
-    >
-      <span translate>{{ error }}</span>
-    </gn-ui-popup-alert>
-  </div>
+      <gn-ui-button
+        *ngIf="!showLegend && legendExists && !selection"
+        type="outline"
+        (buttonClick)="toggleLegend()"
+        extraClass="absolute top-[1em] right-[1em] rounded p-1 text-xs bg-white"
+      >
+        Legend
+      </gn-ui-button>
+
+      <gn-ui-loading-mask
+        *ngIf="loading"
+        class="absolute inset-0"
+        [message]="'map.loading.data' | translate"
+      ></gn-ui-loading-mask>
+      <gn-ui-popup-alert
+        *ngIf="error"
+        type="warning"
+        icon="matErrorOutlineOutline"
+        class="absolute m-2 inset-0"
+      >
+        <span translate>{{ error }}</span>
+      </gn-ui-popup-alert>
+    </div>
+  </ng-template>
 </div>

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

@@ -82,13 +82,14 @@ marker('wfs.feature.limit')
   viewProviders: [provideIcons({ matClose })],
 })
 export class MapViewComponent implements AfterViewInit {
-  @Input() set excludeWfs(value: boolean) {
+  @Input() set exceedsLimit(value: boolean) {
     this.excludeWfs$.next(value)
   }
   @Input() displaySource = true
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
   excludeWfs$ = new BehaviorSubject(false)
+  hidePreview = false
   selection: Feature
   showLegend = true
   legendExists = false
@@ -139,9 +140,10 @@ export class MapViewComponent implements AfterViewInit {
         return of([])
       }
       if (excludeWfs && link.accessServiceProtocol === 'wfs') {
-        this.error = 'wfs.feature.limit'
+        this.hidePreview = true
         return of([])
       }
+      this.hidePreview = false
       this.loading = true
       this.error = null
       return this.getLayerFromLink(link).pipe(
@@ -239,7 +241,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/fuzzy-search/fuzzy-search.component.html

@@ -9,4 +9,5 @@
   [preventCompleteOnSelection]="true"
   [autoFocus]="autoFocus"
   [allowSubmit]="true"
+  [forceTrackPosition]="forceTrackPosition"
 ></gn-ui-autocomplete>

package/src/libs/feature/search/src/lib/fuzzy-search/fuzzy-search.component.ts

@@ -28,6 +28,7 @@ import { SearchFilters } from '../../../../../../libs/api/metadata-converter/src
 export class FuzzySearchComponent implements OnInit {
   @ViewChild(AutocompleteComponent) autocomplete: AutocompleteComponent
   @Input() autoFocus = false
+  @Input() forceTrackPosition = false
   @Output() itemSelected = new EventEmitter<CatalogRecord>()
   @Output() inputSubmitted = new EventEmitter<string>()
   searchInputValue$: Observable<{ title: string }>

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/dataviz/src/index.ts

@@ -1,5 +1,5 @@
 export * from './lib/ui-dataviz.module'
 export * from './lib/chart/chart.component'
-export * from './lib/table/table.component'
-export * from './lib/table/table.fixtures'
+export * from './lib/data-table/data-table.component'
+export * from './lib/data-table/data-table.fixtures'
 export * from './lib/figure/figure.component'

package/src/libs/ui/dataviz/src/lib/data-table/custom.mat.paginator.intl.ts

@@ -0,0 +1,52 @@
+import { Injectable } from '@angular/core'
+import { MatPaginatorIntl } from '@angular/material/paginator'
+import { TranslateService } from '@ngx-translate/core'
+import { Subject } from 'rxjs'
+
+@Injectable()
+export class CustomMatPaginatorIntl extends MatPaginatorIntl {
+  override changes = new Subject<void>()
+
+  constructor(private translate: TranslateService) {
+    super()
+    this.setLabels()
+    this.translate.onLangChange.subscribe(() => {
+      this.setLabels()
+      this.changes.next()
+    })
+  }
+
+  setLabels() {
+    this.itemsPerPageLabel = this.translate.instant(
+      'table.paginator.itemsPerPage'
+    )
+    this.nextPageLabel = this.translate.instant('table.paginator.nextPage')
+    this.previousPageLabel = this.translate.instant(
+      'table.paginator.previousPage'
+    )
+    this.firstPageLabel = this.translate.instant('table.paginator.firstPage')
+    this.lastPageLabel = this.translate.instant('table.paginator.lastPage')
+    this.getRangeLabel = this.getRangeLabelIntl
+    this.changes.next()
+  }
+
+  getRangeLabelIntl(page: number, pageSize: number, length: number): string {
+    if (length === 0 || pageSize === 0) {
+      return this.translate.instant('table.paginator.rangeLabel', {
+        startIndex: 0,
+        endIndex: 0,
+        length,
+      })
+    }
+    const startIndex = page * pageSize
+    const endIndex =
+      startIndex < length
+        ? Math.min(startIndex + pageSize, length)
+        : startIndex + pageSize
+    return this.translate.instant('table.paginator.rangeLabel', {
+      startIndex: startIndex + 1,
+      endIndex,
+      length,
+    })
+  }
+}

package/src/libs/ui/dataviz/src/lib/{table/table.component.css → data-table/data-table.component.css}

@@ -30,3 +30,7 @@ tr {
 .active .mat-mdc-cell {
   color: var(--color-primary);
 }
+
+.mat-mdc-paginator {
+  background: none;
+}

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

@@ -0,0 +1,67 @@
+<div class="flex flex-col border border-gray-300 rounded-lg bg-white h-full">
+  <div class="flex-1 overflow-y-hidden overflow-x-auto rounded-lg relative">
+    <table
+      mat-table
+      [dataSource]="dataSource"
+      matSort
+      (matSortChange)="setSort($event)"
+      [matSortDisableClear]="true"
+      *ngrxLet="properties$ as properties"
+    >
+      <ng-container *ngFor="let prop of properties" [matColumnDef]="prop">
+        <th
+          mat-header-cell
+          *matHeaderCellDef
+          mat-sort-header
+          class="text-sm text-black bg-white"
+        >
+          {{ prop }}
+        </th>
+        <td
+          mat-cell
+          *matCellDef="let element"
+          class="whitespace-nowrap pr-1 truncate"
+        >
+          {{ element[prop] }}
+        </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="properties; sticky: true"></tr>
+      <tr
+        [id]="getRowEltId(row.id)"
+        mat-row
+        *matRowDef="let row; columns: properties"
+        (click)="selected.emit(row)"
+        [class.active]="row.id === activeId"
+      ></tr>
+    </table>
+    <gn-ui-loading-mask
+      *ngIf="loading$ | async"
+      class="sticky inset-0"
+      [message]="'table.loading.data' | translate"
+    ></gn-ui-loading-mask>
+    <gn-ui-popup-alert
+      *ngIf="error"
+      type="warning"
+      icon="matErrorOutlineOutline"
+      class="absolute m-2 inset-0 z-[100]"
+    >
+      <span translate>{{ error }}</span>
+    </gn-ui-popup-alert>
+  </div>
+  <div class="flex justify-between items-center overflow-hidden">
+    <div class="text-gray-900 px-4 py-2 text-sm">
+      <span class="count font-extrabold text-primary">{{ count }}</span
+      >&nbsp;<span translate>table.object.count</span>.
+    </div>
+
+    <mat-paginator
+      class="my-[-16px]"
+      (page)="setPagination()"
+      [length]="count"
+      [pageSize]="10"
+      [showFirstLastButtons]="true"
+      [hidePageSize]="true"
+    ></mat-paginator>
+  </div>
+</div>