geonetwork-ui 2.4.0-alpha.2.dbfa93cf3 → 2.4.0-alpha.2.ddc8a5a9f

package/src/libs/feature/record/src/lib/gpf-api-dl/gpf-api-dl.component.ts

@@ -0,0 +1,253 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { DatasetServiceDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { BehaviorSubject, Observable, combineLatest, map, mergeMap } from 'rxjs'
+import { HttpClient } from '@angular/common/http'
+import { Choice, DropdownSelectorComponent } from '../../../../../../libs/ui/inputs/src'
+import axios from 'axios'
+import { CommonModule } from '@angular/common'
+import { TranslateModule } from '@ngx-translate/core'
+import { GpfApiDlListItemComponent } from '../gpf-api-dl-list-item/gpf-api-dl-list-item.component'
+
+export interface Label {
+  label: string
+}
+
+export interface FormatProduit {
+  title: string
+  update: string
+  format: Array<TermBucket>
+  zone: Array<TermBucket>
+}
+
+export interface FormatSortieProduit {
+  label: string
+  value: string | number
+}
+export interface ListUrl {
+  url: string
+}
+
+export interface ListChoice {
+  zone: Choice[]
+  format: Choice[]
+  editionDate: Choice[]
+  crs: Choice[]
+}
+
+export interface TermBucket {
+  term: string
+  label: string | number
+}
+
+export interface Field {
+  entry: Array<any>
+  link: any
+}
+
+@Component({
+  selector: 'gn-ui-gpf-api-dl',
+  templateUrl: './gpf-api-dl.component.html',
+  styleUrls: ['./gpf-api-dl.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    DropdownSelectorComponent,
+    GpfApiDlListItemComponent,
+  ],
+})
+export class GpfApiDlComponent implements OnInit {
+  isOpen = false
+  collapsed = false
+  initialLimit = 50
+  apiBaseUrl: string
+  editionDate$ = new BehaviorSubject('')
+  zone$ = new BehaviorSubject('')
+  format$ = new BehaviorSubject('')
+  crs$ = new BehaviorSubject('')
+  page$ = new BehaviorSubject(1)
+  url =
+    'https://data.geopf.fr/telechargement/capabilities?outputFormat=application/json'
+  choices: any
+  bucketPromisesZone: Choice[]
+  bucketPromisesFormat: Choice[]
+  bucketPromisesCrs: Choice[]
+
+  constructor(protected http: HttpClient) {}
+
+  @Input() set apiLink(value: DatasetServiceDistribution) {
+    this.apiBaseUrl = value ? value.url.href : undefined
+  }
+
+  ngOnInit(): void {
+    this.bucketPromisesZone = [{ value: '', label: 'ZONE' }]
+    this.bucketPromisesFormat = [{ value: '', label: 'FORMAT' }]
+    this.bucketPromisesCrs = [{ value: '', label: 'CRS' }]
+    this.getFields()
+  }
+
+  apiQueryUrl$ = combineLatest([
+    this.zone$,
+    this.format$,
+    this.editionDate$,
+    this.crs$,
+    this.page$,
+  ]).pipe(
+    map(([zone, format, editionDate, crs, page]) => {
+      let outputUrl
+      if (this.apiBaseUrl) {
+        const url = new URL(this.apiBaseUrl) // initialisation de l'url avec l'url de base
+        const params = {
+          zone: zone,
+          format: format,
+          editionDate: editionDate,
+          crs: crs,
+          page: page,
+        } // initialisation des paramètres de filtres
+        for (const [key, value] of Object.entries(params)) {
+          if (value && value !== 'null') {
+            url.searchParams.set(key, String(value))
+          } else {
+            url.searchParams.delete(key)
+          }
+        }
+        outputUrl = url.toString()
+      } else {
+        console.error('erreur apibaseUrl null')
+      }
+      return outputUrl
+    })
+  )
+
+  listFilteredProduct$ = this.apiQueryUrl$.pipe(
+    mergeMap((url) => {
+      return this.getFilteredProduct$(url).pipe(
+        map((response) => response['entry'])
+      )
+    })
+  )
+
+  pageMax$ = this.apiQueryUrl$.pipe(
+    mergeMap((url) => {
+      return this.getFilteredProduct$(url).pipe(
+        map((response) =>
+          Math.ceil(response['totalentries'] / Number(this.initialLimit))
+        )
+      )
+    })
+  )
+
+  getFilteredProduct$(url): Observable<any> {
+    return this.http.get(url)
+  }
+
+  getLinkFormat(produit): string {
+    return produit['format'][0]['label']
+  }
+
+  setEditionDate(value: string) {
+    if (value.match(/[0-9]{4}-[0-1][0-9]-[0-3][0-9]/)) {
+      this.editionDate$.next(value)
+      this.resetPage()
+    }
+  }
+
+  setZone(value: string) {
+    if (this.bucketPromisesZone.map((choice) => choice.value).includes(value)) {
+      this.zone$.next(value)
+      this.resetPage()
+    }
+  }
+
+  setCrs(value: string) {
+    if (this.bucketPromisesCrs.map((choice) => choice.value).includes(value)) {
+      this.crs$.next(value)
+      this.resetPage()
+    }
+  }
+
+  setFormat(value: string) {
+    if (
+      this.bucketPromisesFormat.map((choice) => choice.value).includes(value)
+    ) {
+      this.format$.next(value)
+      this.resetPage()
+    }
+  }
+
+  resetUrl() {
+    this.zone$.next('null')
+    this.format$.next('null')
+    this.crs$.next('null')
+    this.page$.next(1)
+  }
+  moreResult(): void {
+    this.page$.next(this.page$.value + 1)
+  }
+
+  lessResult(): void {
+    this.page$.next(this.page$.value - 1)
+  }
+
+  resetPage(): void {
+    this.page$.next(1)
+  }
+
+  async getCapabilities() {
+    let page = 0
+    let choicesTest = undefined
+    let pageCount = 1
+
+    while (choicesTest === undefined && pageCount > page) {
+      const response = await axios.get(
+        this.url.concat(`&limit=200&page=${page}`)
+      )
+
+      choicesTest = response.data.entry.filter(
+        (element) => element['id'] == this.apiBaseUrl
+      )[0]
+      page += 1
+      pageCount = response.data.pagecount
+    }
+
+    return choicesTest
+  }
+  async getFields() {
+    this.choices = await this.getCapabilities()
+
+    const tempZone = this.choices.zone.map((bucket) => ({
+      value: bucket.term,
+      label: bucket.label,
+    }))
+    tempZone.sort((a, b) => (a.label > b.label ? 1 : -1))
+    tempZone.unshift({ value: 'null', label: 'ZONE' })
+
+    this.bucketPromisesZone = tempZone
+
+    const tempFormat = this.choices.format.map((bucket) => ({
+      value: bucket.term,
+      label: bucket.label,
+    }))
+    tempFormat.sort((a, b) => (a.label > b.label ? 1 : -1))
+    tempFormat.unshift({ value: 'null', label: 'FORMAT' })
+
+    this.bucketPromisesFormat = tempFormat
+
+    const tempCrs = this.choices.category.map((bucket) => ({
+      value: bucket.term,
+      label: bucket.label,
+    }))
+    tempCrs.sort((a, b) => (a.label > b.label ? 1 : -1))
+    tempCrs.unshift({ value: 'null', label: 'CRS' })
+
+    this.bucketPromisesCrs = tempCrs
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  }
+}

package/src/libs/feature/record/src/lib/gpf-api-dl-list-item/gpf-api-dl-list-item.component.html

@@ -0,0 +1,37 @@
+<a
+  class="group flex justify-between card-shadow px-6 py-5 cursor-pointer"
+  rel="noopener"
+>
+  <div class="grow-1 w-full overflow-hidden">
+    <div
+      class="text-16 text-black truncate font-title w-11/12"
+      [title]="link['title'] || link.name"
+    >
+      {{ link['title'] || link.name }}
+    </div>
+    <div class="pt-1">
+      <span
+        class="inline-flex items-center justify-center px-2 py-1 text-13 font-medium leading-none text-white rounded transition-opacity opacity-70 group-hover:opacity-100"
+        [style.background-color]="color"
+        data-cy="download-format"
+        >{{ format || ('downloads.format.unknown' | translate) }}</span
+      >
+      <span
+        class="pl-2 inline-flex items-center text-gray-800 text-sm"
+        *ngIf="isFromWfs"
+        translate=""
+        >datahub.search.filter.generatedByWfs</span
+      >
+    </div>
+    <div *ngFor="let entry of liste$ | async">
+      <a [href]="entry['link'][0]['href']"
+        >{{ entry['link'][0]['href'].split('/').slice(-1) }}
+        <ng-icon
+          class="text-primary opacity-45 mr-3"
+          name="matCloudDownloadOutline"
+        >
+        </ng-icon>
+      </a>
+    </div>
+  </div>
+</a>

package/src/libs/feature/record/src/lib/gpf-api-dl-list-item/gpf-api-dl-list-item.component.ts

@@ -0,0 +1,43 @@
+import { CommonModule } from '@angular/common'
+import { HttpClient } from '@angular/common/http'
+import { Component, Input, OnInit } from '@angular/core'
+import { NgIconsModule } from '@ng-icons/core'
+import { TranslateModule } from '@ngx-translate/core'
+import { Observable, map, mergeMap } from 'rxjs'
+
+@Component({
+  selector: 'gn-ui-gpf-api-dl-list-item',
+  templateUrl: './gpf-api-dl-list-item.component.html',
+  styleUrls: ['./gpf-api-dl-list-item.component.css'],
+  standalone: true,
+  imports: [CommonModule, TranslateModule, NgIconsModule],
+})
+export class GpfApiDlListItemComponent implements OnInit {
+  @Input() link
+  @Input() color: string
+  @Input() format: string
+  @Input() isFromWfs: boolean
+
+  constructor(protected http: HttpClient) {}
+  liste$: Observable<any>
+
+  ngOnInit(): void {
+    this.liste$ = this.http
+      .get(this.link['id'])
+      .pipe(map((response) => response['entry']))
+  }
+
+  downloadListe(): void {
+    this.http
+      .get(this.link['id'])
+      .pipe(
+        map((response) => response['entry']),
+        mergeMap((response) => response)
+      )
+      .subscribe((reponse) => this.download(reponse['id']))
+  }
+
+  download(url): void {
+    this.http.get(url).subscribe()
+  }
+}

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

@@ -3,6 +3,7 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  Input,
   ViewChild,
 } from '@angular/core'
 import { MapUtilsService } from '../../../../../../libs/feature/map/src'
@@ -54,6 +55,10 @@ import {
   LoadingMaskComponent,
   PopupAlertComponent,
 } from '../../../../../../libs/ui/widgets/src'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+
+marker('map.dropdown.placeholder')
+marker('wfs.feature.limit')
 
 @Component({
   selector: 'gn-ui-map-view',
@@ -77,8 +82,12 @@ import {
   viewProviders: [provideIcons({ matClose })],
 })
 export class MapViewComponent implements AfterViewInit {
+  @Input() set excludeWfs(value: boolean) {
+    this.excludeWfs$.next(value)
+  }
   @ViewChild('mapContainer') mapContainer: MapContainerComponent
 
+  excludeWfs$ = new BehaviorSubject(false)
   selection: Feature
   showLegend = true
   legendExists = false
@@ -110,7 +119,7 @@ export class MapViewComponent implements AfterViewInit {
             label: getLinkLabel(link),
             value: index,
           }))
-        : [{ label: 'No preview layer', value: 0 }]
+        : [{ label: 'map.dropdown.placeholder', value: 0 }]
     )
   )
   selectedLinkIndex$ = new BehaviorSubject(0)
@@ -123,11 +132,15 @@ export class MapViewComponent implements AfterViewInit {
     this.selectedLinkIndex$.pipe(distinctUntilChanged()),
   ]).pipe(map(([links, index]) => links[index]))
 
-  currentLayers$ = this.selectedLink$.pipe(
-    switchMap((link) => {
+  currentLayers$ = combineLatest([this.selectedLink$, this.excludeWfs$]).pipe(
+    switchMap(([link, excludeWfs]) => {
       if (!link) {
         return of([])
       }
+      if (excludeWfs && link.accessServiceProtocol === 'wfs') {
+        this.error = 'wfs.feature.limit'
+        return of([])
+      }
       this.loading = true
       this.error = null
       return this.getLayerFromLink(link).pipe(

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

@@ -15,6 +15,7 @@ import { LinkClassifierService, LinkUsage } from '../../../../../../libs/util/sh
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import {
   CatalogRecord,
+  DatasetServiceDistribution,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { AvatarServiceInterface } from '../../../../../../libs/api/repository/src'
@@ -72,7 +73,15 @@ export class MdViewFacade {
 
   apiLinks$ = this.allLinks$.pipe(
     map((links) =>
-      links.filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
+      links
+        .filter((link) => this.linkClassifier.hasUsage(link, LinkUsage.API))
+        // Put links to IGN Géoplateforme first
+        .sort((dd1, dd2) => {
+          return (dd2 as DatasetServiceDistribution).accessServiceProtocol ===
+            'GPFDL'
+            ? 1
+            : undefined // do not change the sorting otherwise
+        })
     )
   )
 

package/src/libs/feature/search/src/lib/facets/facets.service.ts

@@ -72,19 +72,19 @@ export class FacetsService {
               for (let p = 0; p < entries.length; p++) {
                 const entry: [string, AggEntry] = entries[p] as [
                   string,
-                  AggEntry
+                  AggEntry,
                 ]
                 const nextEntry: [string, AggEntry] = entries[p + 1] as [
                   string,
-                  AggEntry
+                  AggEntry,
                 ]
                 const lowerBound = entry[1].key
                 const onlyOneBucket = entries.length === 1
                 const upperBound = onlyOneBucket
                   ? lowerBound + Number(requestAgg['histogram'].interval)
                   : nextEntry
-                  ? nextEntry[1].key
-                  : '*'
+                    ? nextEntry[1].key
+                    : '*'
                 const value = lowerBound + '-' + upperBound
                 const itemPath = [...blockModel.path, lowerBound + '']
                 const itemModel = {

package/src/libs/feature/search/src/lib/state/actions.ts

@@ -56,7 +56,10 @@ export class AddSearch implements Action {
 export class SetConfigFilters extends AbstractAction implements Action {
   readonly type = SET_CONFIG_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -64,7 +67,10 @@ export class SetConfigFilters extends AbstractAction implements Action {
 export class SetFilters extends AbstractAction implements Action {
   readonly type = SET_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -72,7 +78,10 @@ export class SetFilters extends AbstractAction implements Action {
 export class UpdateFilters extends AbstractAction implements Action {
   readonly type = UPDATE_FILTERS
 
-  constructor(public payload: FieldFilters, id?: string) {
+  constructor(
+    public payload: FieldFilters,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -80,27 +89,39 @@ export class UpdateFilters extends AbstractAction implements Action {
 export class SetSearch extends AbstractAction implements Action {
   readonly type = SET_SEARCH
 
-  constructor(public payload: SearchStateParams, id?: string) {
+  constructor(
+    public payload: SearchStateParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetFavoritesOnly extends AbstractAction implements Action {
   readonly type = SET_FAVORITES_ONLY
-  constructor(public favoritesOnly: boolean, id?: string) {
+  constructor(
+    public favoritesOnly: boolean,
+    id?: string
+  ) {
     super(id)
   }
 }
 export class SetSortBy extends AbstractAction implements Action {
   readonly type = SET_SORT_BY
-  constructor(public sortBy: SortByField, id?: string) {
+  constructor(
+    public sortBy: SortByField,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetPageSize extends AbstractAction implements Action {
   readonly type = SET_PAGE_SIZE
-  constructor(public limit: number, id?: string) {
+  constructor(
+    public limit: number,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -108,7 +129,10 @@ export class SetPageSize extends AbstractAction implements Action {
 export class Paginate extends AbstractAction implements Action {
   readonly type = PAGINATE
   // Note: page number is one-based!!
-  constructor(public pageNumber: number, id?: string) {
+  constructor(
+    public pageNumber: number,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -116,7 +140,10 @@ export class Paginate extends AbstractAction implements Action {
 export class SetResultsLayout extends AbstractAction implements Action {
   readonly type = SET_RESULTS_LAYOUT
 
-  constructor(public resultsLayout: string, id?: string) {
+  constructor(
+    public resultsLayout: string,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -124,7 +151,10 @@ export class SetResultsLayout extends AbstractAction implements Action {
 export class AddResults extends AbstractAction implements Action {
   readonly type = ADD_RESULTS
 
-  constructor(public payload: CatalogRecord[], id?: string) {
+  constructor(
+    public payload: CatalogRecord[],
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -156,35 +186,50 @@ export class RequestNewResults extends AbstractAction implements Action {
 export class SetResultsAggregations extends AbstractAction implements Action {
   readonly type = SET_RESULTS_AGGREGATIONS
 
-  constructor(public payload: Aggregations, id?: string) {
+  constructor(
+    public payload: Aggregations,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetResultsHits extends AbstractAction implements Action {
   readonly type = SET_RESULTS_HITS
-  constructor(public payload: number, id?: string) {
+  constructor(
+    public payload: number,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetConfigAggregations extends AbstractAction implements Action {
   readonly type = SET_CONFIG_AGGREGATIONS
-  constructor(public payload: AggregationsParams, id?: string) {
+  constructor(
+    public payload: AggregationsParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class UpdateConfigAggregations extends AbstractAction implements Action {
   readonly type = UPDATE_CONFIG_AGGREGATIONS
-  constructor(public payload: AggregationsParams, id?: string) {
+  constructor(
+    public payload: AggregationsParams,
+    id?: string
+  ) {
     super(id)
   }
 }
 
 export class SetConfigRequestFields extends AbstractAction implements Action {
   readonly type = SET_CONFIG_REQUEST_FIELDS
-  constructor(public payload: FieldName[], id?: string) {
+  constructor(
+    public payload: FieldName[],
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -226,7 +271,11 @@ export class PatchResultsAggregations extends AbstractAction implements Action {
 export class SetError extends AbstractAction implements Action {
   readonly type = SET_ERROR
 
-  constructor(public code: number, public message: string, id?: string) {
+  constructor(
+    public code: number,
+    public message: string,
+    id?: string
+  ) {
     super(id)
   }
 }
@@ -241,7 +290,10 @@ export class ClearError extends AbstractAction implements Action {
 
 export class SetSpatialFilterEnabled extends AbstractAction implements Action {
   readonly type = SET_SPATIAL_FILTER_ENABLED
-  constructor(public enabled: boolean, id?: string) {
+  constructor(
+    public enabled: boolean,
+    id?: string
+  ) {
     super(id)
   }
 }

package/src/libs/feature/search/src/lib/state/effects.ts

@@ -154,7 +154,7 @@ export class SearchEffects {
             ([state, favorites, geometry]: [
               SearchStateSearch,
               string[],
-              Geometry | undefined
+              Geometry | undefined,
             ]) => {
               const { currentPage, pageSize, sort } = state.params
               const filters = {

package/src/libs/ui/dataviz/src/lib/chart/chart.component.ts

@@ -88,7 +88,7 @@ export class ChartComponent implements OnChanges, AfterViewInit {
     const data = this.handlesSecondaryValue()
       ? (this.getDataProxy(this.valueProperty, this.secondaryValueProperty) as [
           number,
-          number
+          number,
         ][])
       : (this.getDataProxy(this.valueProperty) as number[])
     return {

package/src/libs/ui/dataviz/src/lib/figure/figure.component.html

@@ -9,14 +9,15 @@
     (title | translate: { count: figure })
   "
 >
-  <ng-icon
+  <div
     class="{{ bgClass }} {{
       textClass
-    }} text-[1.875em] rounded-full mr-[0.55em] p-[0.6em] w-[2.2em] h-[2.2em] shrink-0"
+    }} text-[1.875em] rounded-full mr-[0.55em] flex justify-center items-center w-[2.2em] h-[2.2em] shrink-0"
     style="width: 2.2em; height: 2.2em"
-    [name]="icon"
+    data-test="icon-container"
   >
-  </ng-icon>
+    <ng-icon class="text-[0.66em]" [name]="icon"> </ng-icon>
+  </div>
   <div class="shrink overflow-hidden">
     <div class="figure-block text-[1.5em] text-black">
       <span class="figure font-medium mr-[0.3em]" data-test="figure">{{