geonetwork-ui 2.10.0-dev.a66718398 → 2.10.0-dev.e97ea6950

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/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 = ''
     }
   }