geonetwork-ui 2.9.0-dev.fc19cbfed → 2.10.0-dev.0d4a494fa

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.html

@@ -20,7 +20,7 @@
     [disabled]="disabled"
     (change)="resetAllFormFields()"
   >
-    @for (protocolOption of protocolOptions; track protocolOption) {
+    @for (protocolOption of availableProtocolOptions; track protocolOption) {
       <mat-radio-button [value]="protocolOption.value">
         {{ protocolOption.label | translate }}
       </mat-radio-button>
@@ -45,6 +45,11 @@
     }
   </gn-ui-url-input>
 
+  @if (loading) {
+    <div class="flex justify-center w-full py-4">
+      <gn-ui-spinning-loader></gn-ui-spinning-loader>
+    </div>
+  }
   @if (errorMessage) {
     <p class="text-sm text-red-500 pl-4" translate>
       editor.record.form.field.onlineResource.edit.identifier.error

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.ts

@@ -22,6 +22,7 @@ import {
   TextInputComponent,
   UrlInputComponent,
 } from '../../../../../../../libs/ui/inputs/src'
+import { SpinningLoaderComponent } from '../../../../../../../libs/ui/widgets/src'
 import { createFuzzyFilter, getLayers } from '../../../../../../../libs/util/shared/src'
 import {
   NgIconComponent,
@@ -57,6 +58,7 @@ marker(
     MatTooltipModule,
     MatRadioModule,
     NgIconComponent,
+    SpinningLoaderComponent,
     TextInputComponent,
     TranslateDirective,
     TranslatePipe,
@@ -79,17 +81,19 @@ export class OnlineServiceResourceInputComponent {
   @Input() protocolHint?: string
   @Input() disabled? = false
   @Input() modifyMode? = false
+  @Input() protocolOptions?: ServiceProtocol[]
   @Output() serviceChange: EventEmitter<DatasetServiceDistribution> =
     new EventEmitter()
 
   errorMessage = false
+  loading = false
   resetUrlOnChange = Math.random()
 
   layersSubject = new BehaviorSubject<{ name?: string; title?: string }[]>([])
   layers$: Observable<{ name?: string; title?: string }[]> =
     this.layersSubject.asObservable()
 
-  protocolOptions: {
+  allProtocolOptions: {
     label: string
     value: ServiceProtocol
   }[] = [
@@ -123,6 +127,13 @@ export class OnlineServiceResourceInputComponent {
     },
   ]
 
+  get availableProtocolOptions() {
+    if (!this.protocolOptions) return this.allProtocolOptions
+    return this.protocolOptions.flatMap(
+      (v) => this.allProtocolOptions.find((o) => o.value === v) ?? []
+    )
+  }
+
   get activeLayerSuggestion() {
     return !['wps', 'GPFDL', 'esriRest', 'other'].includes(
       this._service.accessServiceProtocol
@@ -135,6 +146,8 @@ export class OnlineServiceResourceInputComponent {
   }
 
   async handleUploadClick(url: string) {
+    this.loading = true
+    this.cdr.detectChanges()
     try {
       const layers = await getLayers(url, this._service.accessServiceProtocol)
 
@@ -148,6 +161,7 @@ export class OnlineServiceResourceInputComponent {
       this.layersSubject.next([])
     }
 
+    this.loading = false
     this.cdr.detectChanges()
   }
 
@@ -159,6 +173,7 @@ export class OnlineServiceResourceInputComponent {
 
   resetLayersSuggestion() {
     this.errorMessage = false
+    this.loading = false
     this.layersSubject.next([])
     this._service.identifierInService = null
   }

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

@@ -20,8 +20,8 @@ export interface Label {
 export interface FormatProduit {
   title: string
   update: string
-  format: Array<TermBucket>
-  zone: Array<TermBucket>
+  format: Array<GpfApiDlTermBucket>
+  zone: Array<GpfApiDlTermBucket>
 }
 
 export interface FormatSortieProduit {
@@ -39,7 +39,7 @@ export interface ListChoice {
   crs: Choice[]
 }
 
-export interface TermBucket {
+export interface GpfApiDlTermBucket {
   term: string
   label: string | number
 }
@@ -77,7 +77,11 @@ export class GpfApiDlComponent implements OnInit {
   page$ = new BehaviorSubject(1)
   url =
     'https://data.geopf.fr/telechargement/capabilities?outputFormat=application/json'
-  choices: { zone: TermBucket[]; format: TermBucket[]; category: TermBucket[] }
+  choices: {
+    zone: GpfApiDlTermBucket[]
+    format: GpfApiDlTermBucket[]
+    category: GpfApiDlTermBucket[]
+  }
   bucketPromisesZone: Choice[]
   bucketPromisesFormat: Choice[]
   bucketPromisesCrs: Choice[]

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts

@@ -2,8 +2,8 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
-  Input,
   inject,
+  Input,
 } from '@angular/core'
 import { TranslateDirective, TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
@@ -67,13 +67,15 @@ export class DownloadsListComponent {
   ): DatasetDownloadDistribution[] {
     const preferredLinks = new Map<string, DatasetDownloadDistribution>()
 
-    links.forEach((link) => {
+    links.forEach((link, index) => {
       const format = getFileFormat(link)
       const withoutNameSpace = (link.name || link.description || '').replace(
         /^.*?:/,
         ''
       )
-      const uniqueKey = `${format}-${withoutNameSpace}`
+      const uniqueKey = link.accessServiceProtocol
+        ? `${format}-${withoutNameSpace}`
+        : index.toString() // direct download links should not be deduplicated
       if (!preferredLinks.has(uniqueKey)) {
         preferredLinks.set(uniqueKey, link)
       } else {

package/src/libs/ui/inputs/src/lib/dropdown-selector/dropdown-selector.component.ts

@@ -102,7 +102,7 @@ export class DropdownSelectorComponent implements OnInit {
   }
 
   getChoiceLabel(): string {
-    return this.selectedChoice?.label
+    return this.selectedChoice?.label ?? '\u00A0'
   }
 
   ngOnInit(): void {

package/src/libs/ui/inputs/src/lib/url-input/url-input.component.ts

@@ -62,7 +62,10 @@ export class UrlInputComponent implements OnChanges {
   inputValue = ''
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes['resetUrlOnChange']) {
+    if (
+      changes['resetUrlOnChange'] &&
+      !changes['resetUrlOnChange'].firstChange
+    ) {
       this.inputValue = ''
     }
   }

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -97,6 +97,7 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
         ['geonetwork4_api_url'],
         [
           'datahub_url',
+          'edit_url_template',
           'proxy_path',
           'metadata_language',
           'login_url',
@@ -122,6 +123,7 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
           : ({
               GN4_API_URL: parsedGlobalSection.geonetwork4_api_url,
               DATAHUB_URL: parsedGlobalSection.datahub_url,
+              EDIT_URL_TEMPLATE: parsedGlobalSection.edit_url_template,
               PROXY_PATH: parsedGlobalSection.proxy_path,
               METADATA_LANGUAGE: parsedGlobalSection.metadata_language
                 ? (

package/src/libs/util/app-config/src/lib/model.ts

@@ -3,6 +3,7 @@ import { Geometry } from 'geojson'
 export interface GlobalConfig {
   GN4_API_URL: string
   DATAHUB_URL?: string
+  EDIT_URL_TEMPLATE?: string
   PROXY_PATH?: string
   METADATA_LANGUAGE?: string
   LOGIN_URL?: string

package/translations/de.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "Benutzername",
   "dashboard.records.users": "{count, plural, =1{Benutzer} other{Benutzer}}",
   "datahub.header.datasets": "Katalog",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "Die neuesten",
   "datahub.header.myfavorites": "Meine Favoriten",
   "datahub.header.news": "Startseite",

package/translations/en.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "Username",
   "dashboard.records.users": "{count, plural, =1{user} other{users}}",
   "datahub.header.datasets": "Catalog",
+  "datahub.header.edit.url.open": "Edit",
   "datahub.header.lastRecords": "The latest",
   "datahub.header.myfavorites": "My favorites",
   "datahub.header.news": "Home",

package/translations/es.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "",
   "dashboard.records.users": "",
   "datahub.header.datasets": "Catálogo",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "",
   "datahub.header.myfavorites": "",
   "datahub.header.news": "",

package/translations/fr.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "Nom d'utilisateur",
   "dashboard.records.users": "{count, plural, =1{utilisateur} other{utilisateurs}}",
   "datahub.header.datasets": "Catalogue",
+  "datahub.header.edit.url.open": "Editer",
   "datahub.header.lastRecords": "Les plus récentes",
   "datahub.header.myfavorites": "Mes favoris",
   "datahub.header.news": "Accueil",

package/translations/it.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "Nome utente",
   "dashboard.records.users": "utenti",
   "datahub.header.datasets": "Catalogo",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "Ultimi",
   "datahub.header.myfavorites": "Miei preferiti",
   "datahub.header.news": "Home",

package/translations/nl.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "",
   "dashboard.records.users": "",
   "datahub.header.datasets": "Catalog",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "",
   "datahub.header.myfavorites": "",
   "datahub.header.news": "",

package/translations/pt.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "",
   "dashboard.records.users": "",
   "datahub.header.datasets": "Catálogo",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "",
   "datahub.header.myfavorites": "",
   "datahub.header.news": "",

package/translations/sk.json

@@ -38,6 +38,7 @@
   "dashboard.records.username": "Užívateľské meno",
   "dashboard.records.users": "{count, plural, =1{užívateľ} other{užívatelia}}",
   "datahub.header.datasets": "Katalóg",
+  "datahub.header.edit.url.open": "",
   "datahub.header.lastRecords": "Najnovšie",
   "datahub.header.myfavorites": "Moje obľúbené",
   "datahub.header.news": "Domov",