geonetwork-ui 2.4.0 → 2.4.1-dev.1d2ade24e

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

@@ -1,9 +1,13 @@
 import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
+  EventEmitter,
   Input,
   OnChanges,
+  OnInit,
+  Output,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { MatRadioModule } from '@angular/material/radio'
@@ -13,8 +17,28 @@ import {
   DatasetServiceDistribution,
   ServiceProtocol,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
-import { TextInputComponent } from '../../../../../../../libs/ui/inputs/src'
+import {
+  AutocompleteComponent,
+  ButtonComponent,
+  TextInputComponent,
+  UrlInputComponent,
+} from '../../../../../../../libs/ui/inputs/src'
 import { TranslateModule } from '@ngx-translate/core'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirCloudUpload } from '@ng-icons/iconoir'
+import { createFuzzyFilter, getLayers } from '../../../../../../../libs/util/shared/src'
+import {
+  BehaviorSubject,
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  Observable,
+  switchMap,
+} from 'rxjs'
 
 @Component({
   selector: 'gn-ui-online-service-resource-input',
@@ -23,20 +47,41 @@ import { TranslateModule } from '@ngx-translate/core'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
+    AutocompleteComponent,
+    ButtonComponent,
     CommonModule,
+    FormsModule,
     MatTooltipModule,
     MatRadioModule,
-    FormsModule,
+    NgIconComponent,
     TextInputComponent,
     TranslateModule,
+    UrlInputComponent,
+  ],
+  providers: [
+    provideIcons({ iconoirCloudUpload }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
-export class OnlineServiceResourceInputComponent implements OnChanges {
-  @Input() service: Omit<DatasetServiceDistribution, 'url'>
+export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
+  @Input() service: DatasetServiceDistribution
   @Input() protocolHint?: string
   @Input() disabled? = false
+  @Input() modifyMode? = false
+  @Output() urlChange: EventEmitter<string> = new EventEmitter()
+  @Output() identifierSubmit: EventEmitter<{
+    url: string
+    identifier: string
+  }> = new EventEmitter()
 
+  errorMessage = false
   selectedProtocol: ServiceProtocol
+  url = ''
+  layersSubject = new BehaviorSubject<{ name: string; title: string }[]>([])
+  layers$: Observable<{ name: string; title: string }[]> =
+    this.layersSubject.asObservable()
 
   protocolOptions: {
     label: string
@@ -72,10 +117,106 @@ export class OnlineServiceResourceInputComponent implements OnChanges {
     },
   ]
 
+  constructor(private cdr: ChangeDetectorRef) {}
+
+  get activeLayerSuggestion() {
+    return !['wps', 'GPFDL', 'esriRest', 'other'].includes(
+      this.service.accessServiceProtocol
+    )
+  }
+
   ngOnChanges() {
     this.selectedProtocol =
       this.protocolOptions.find(
         (option) => option.value === this.service.accessServiceProtocol
       )?.value ?? 'other'
   }
+
+  ngOnInit() {
+    if (this.service.url) {
+      this.url = this.service.url.toString()
+    }
+  }
+
+  handleUrlValueChange(url: string) {
+    this.url = url
+    this.service.url = url ? new URL(url) : undefined
+    this.resetLayersSuggestion()
+    this.urlChange.emit(this.url)
+  }
+
+  async handleUploadClick(url: string) {
+    this.url = url
+
+    try {
+      const layers = await getLayers(url, this.service.accessServiceProtocol)
+
+      if (layers.length === 0) {
+        throw new Error('No layers found')
+      }
+
+      this.layersSubject.next([...layers])
+    } catch (e) {
+      this.errorMessage = true
+      this.layersSubject.next([])
+    }
+
+    this.cdr.detectChanges()
+  }
+
+  resetAllFormFields() {
+    this.url = ''
+    this.service.url = null
+    this.resetLayersSuggestion()
+  }
+
+  resetLayersSuggestion() {
+    this.errorMessage = false
+    this.layersSubject.next([])
+    this.service.identifierInService = null
+  }
+
+  submitIdentifier(identifier: string) {
+    if (!identifier) return
+    this.identifierSubmit.emit({ url: this.url, identifier })
+    this.service.identifierInService = null
+  }
+
+  getIdentifierPlaceholder(): string {
+    const baseKey =
+      'editor.record.form.field.onlineResource.edit.identifier.placeholder'
+    return this.service.accessServiceProtocol === 'wps'
+      ? `${baseKey}.wps`
+      : baseKey
+  }
+
+  /**
+   * gn-ui-autocomplete
+   */
+  displayWithFn(item: { name: string; title: string }) {
+    return item.title
+      ? `${item.title} ${item.name ? `(${item.name})` : ''}`
+      : item.name
+  }
+
+  /**
+   * gn-ui-autocomplete
+   */
+  autoCompleteAction = (query: string) => {
+    const fuzzyFilter = createFuzzyFilter(query)
+    return this.layers$.pipe(
+      switchMap((layers) => [
+        layers.filter((layer) => fuzzyFilter(layer.name)),
+      ]),
+      debounceTime(100),
+      distinctUntilChanged()
+    )
+  }
+
+  /**
+   * gn-ui-autocomplete
+   */
+  handleSelectValue(val: { name: string; title: string }) {
+    this.service.identifierInService = val.name
+  }
 }

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.html

@@ -2,7 +2,7 @@
   <gn-ui-dropdown-selector
     [title]="label"
     [showTitle]="false"
-    [choices]="licenceOptions"
+    [choices]="choices"
     [selected]="selectedLicence"
     (selectValue)="handleLicenceSelection($event)"
     [extraBtnClass]="'input-as-button gn-ui-text-input'"

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-license/form-field-license.component.ts

@@ -26,35 +26,47 @@ type Licence = {
 })
 export class FormFieldLicenseComponent implements OnInit {
   @Input() label: string
-  @Input() recordConstraints: Constraint[] = []
-  @Output() recordConstraintsChange: EventEmitter<Constraint[]> =
+  @Input() recordLicences: Constraint[] = []
+  @Output() recordLicencesChange: EventEmitter<Constraint[]> =
     new EventEmitter()
 
+  choices: Licence[] = AVAILABLE_LICENSES.map((license) => ({
+    label: marker(`editor.record.form.license.${license}`),
+    value: license,
+  }))
+
   selectedLicence: string
 
   ngOnInit(): void {
-    // get the licence from the record constraints if it is one of the open data licence list
-    this.selectedLicence = this.recordConstraints.find((constraint) => {
-      return this.licenceOptions.find((licence) => {
-        return licence.value === constraint.text
-      })
-    })?.text
-    // otherwise pre-select the first licence option
-    if (this.selectedLicence === undefined) {
-      this.selectedLicence = this.licenceOptions[0].value // cannot select 'etalab' as default as this would toggle the OpenData Toggle
-      this.recordConstraintsChange.emit([{ text: this.selectedLicence }])
+    if (this.recordLicences.length === 0) {
+      this.selectedLicence = 'unknown'
+    } else {
+      this.selectedLicence = this.recordLicences.find((constraint) => {
+        return this.choices.find((licence) => {
+          return licence.value === constraint.text
+        })
+      })?.text
     }
-  }
 
-  get licenceOptions(): Licence[] {
-    return AVAILABLE_LICENSES.map((license) => ({
-      label: marker(`editor.record.form.license.${license}`),
-      value: license,
-    }))
+    if (this.selectedLicence === undefined) {
+      this.choices = [
+        {
+          value: this.recordLicences[0].text,
+          label: this.recordLicences[0].text,
+        },
+        ...this.choices,
+      ]
+      this.selectedLicence = this.recordLicences[0].text
+    }
   }
 
   handleLicenceSelection(licenceValue: string) {
     this.selectedLicence = licenceValue
-    this.recordConstraintsChange.emit([{ text: licenceValue }])
+    if (licenceValue === 'unknown') {
+      this.recordLicencesChange.emit([])
+      return
+    } else {
+      this.recordLicencesChange.emit([{ text: licenceValue }])
+    }
   }
 }

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-link-resources/form-field-online-link-resources.component.html

@@ -5,7 +5,6 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleUrlChange($event)"
-    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div class="h-[8px]"></div>
   <gn-ui-sortable-list
@@ -42,17 +41,9 @@
         class="w-full"
         [disabled]="true"
         [value]="onlineResource.url"
-        [showUploadButton]="false"
         [disabled]="disabled$ | async"
+        [showValidateButton]="false"
       ></gn-ui-url-input>
     </div>
   </ng-template>
-  <div
-    *ngIf="disabled$ | async"
-    class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"
-    translate
-    data-test="disabled-message"
-  >
-    editor.record.form.field.draft.only.disabled
-  </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-link-resources/form-field-online-link-resources.component.ts

@@ -30,7 +30,6 @@ import { PlatformServiceInterface } from '../../../../../../../../../libs/common
 import { map, Subscription } from 'rxjs'
 import { MatDialog } from '@angular/material/dialog'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
-import { EditorFacade } from '../../../../+state/editor.facade'
 
 @Component({
   selector: 'gn-ui-form-field-online-link-resources',
@@ -69,17 +68,12 @@ export class FormFieldOnlineLinkResourcesComponent {
 
   protected MAX_UPLOAD_SIZE_MB = MAX_UPLOAD_SIZE_MB
 
-  disabled$ = this.editorFacade.alreadySavedOnce$.pipe(
-    map((alreadySavedOnce) => !alreadySavedOnce)
-  )
-
   constructor(
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private platformService: PlatformServiceInterface,
     private cd: ChangeDetectorRef,
-    private dialog: MatDialog,
-    private editorFacade: EditorFacade
+    private dialog: MatDialog
   ) {}
 
   handleFileChange(file: File) {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-resources/form-field-online-resources.component.html

@@ -4,7 +4,6 @@
     (selectedValue)="onSelectedTypeChange($event.value)"
     extraClasses="grow text-sm"
     data-cy="online-resources-type"
-    [disabled]="disabled$ | async"
   ></gn-ui-switch-toggle>
   <div class="h-[8px]"></div>
   <gn-ui-file-input
@@ -14,7 +13,6 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleDownloadUrlChange($event)"
-    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div
     *ngIf="selectedType === 'service'"
@@ -23,13 +21,8 @@
     <gn-ui-online-service-resource-input
       [service]="newService"
       [disabled]="disabled$ | async"
+      (identifierSubmit)="handleIdentifierSubmit($event)"
     ></gn-ui-online-service-resource-input>
-    <span class="w-full border-b border-gray-300"></span>
-    <gn-ui-url-input
-      class="w-full"
-      (uploadClick)="handleServiceUrlChange($event)"
-      [disabled]="disabled$ | async"
-    ></gn-ui-url-input>
   </div>
   <div class="h-[8px]"></div>
   <gn-ui-sortable-list
@@ -61,28 +54,22 @@
           [(value)]="onlineResource.description"
         ></gn-ui-text-area>
       </div>
-      <ng-container *ngIf="onlineResource.type === 'service'">
+      <ng-container *ngIf="onlineResource.type === 'service'; else urlInput">
         <span class="w-full border-b border-gray-300"></span>
         <gn-ui-online-service-resource-input
           [service]="onlineResource"
-          [disabled]="disabled$ | async"
+          [modifyMode]="true"
         ></gn-ui-online-service-resource-input>
       </ng-container>
-      <span class="w-full border-b border-gray-300"></span>
-      <gn-ui-url-input
-        class="w-full"
-        [disabled]="true"
-        [value]="onlineResource.url"
-        [showUploadButton]="false"
-      ></gn-ui-url-input>
+      <ng-template #urlInput>
+        <span class="w-full border-b border-gray-300"></span>
+        <gn-ui-url-input
+          class="w-full"
+          [disabled]="true"
+          [value]="onlineResource.url"
+          [showValidateButton]="false"
+        ></gn-ui-url-input>
+      </ng-template>
     </div>
   </ng-template>
-  <div
-    *ngIf="disabled$ | async"
-    class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"
-    translate
-    data-test="disabled-message"
-  >
-    editor.record.form.field.draft.only.disabled
-  </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-resources/form-field-online-resources.component.ts

@@ -32,11 +32,10 @@ import {
   SortableListComponent,
 } from '../../../../../../../../../libs/ui/layout/src'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
-import { map, Subscription } from 'rxjs'
+import { Subscription } from 'rxjs'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
 import { OnlineResourceCardComponent } from '../../../online-resource-card/online-resource-card.component'
 import { OnlineServiceResourceInputComponent } from '../../../online-service-resource-input/online-service-resource-input.component'
-import { EditorFacade } from '../../../../+state/editor.facade'
 
 type OnlineNotLinkResource =
   | DatasetDownloadDistribution
@@ -93,25 +92,21 @@ export class FormFieldOnlineResourcesComponent {
   notLinkResources: OnlineNotLinkResource[] = []
   uploadProgress = undefined
   uploadSubscription: Subscription = null
-  newService = {
+  newService = <DatasetServiceDistribution>{
     type: 'service',
     accessServiceProtocol: 'ogcFeatures',
     identifierInService: '',
-  } as Omit<DatasetServiceDistribution, 'url'>
+    url: undefined,
+  }
 
   protected MAX_UPLOAD_SIZE_MB = MAX_UPLOAD_SIZE_MB
 
-  disabled$ = this.editorFacade.alreadySavedOnce$.pipe(
-    map((alreadySavedOnce) => !alreadySavedOnce)
-  )
-
   constructor(
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private platformService: PlatformServiceInterface,
     private cd: ChangeDetectorRef,
-    private dialog: MatDialog,
-    private editorFacade: EditorFacade
+    private dialog: MatDialog
   ) {}
 
   onSelectedTypeChange(selectedType: unknown) {
@@ -174,6 +169,16 @@ export class FormFieldOnlineResourcesComponent {
     ])
   }
 
+  handleIdentifierSubmit(payload: { url: string; identifier: string }) {
+    this.valueChange.emit([
+      ...this.allResources,
+      {
+        ...this.newService,
+        url: new URL(payload.url),
+      },
+    ])
+  }
+
   handleServiceModify(
     oldService: DatasetServiceDistribution,
     newService: DatasetServiceDistribution

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-overviews/form-field-overviews.component.html

@@ -9,14 +9,5 @@
     (delete)="handleDelete()"
     [uploadProgress]="uploadProgress"
     (uploadCancel)="handleUploadCancel()"
-    [disabled]="disabled$ | async"
   ></gn-ui-image-input>
-  <div
-    *ngIf="disabled$ | async"
-    class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"
-    translate
-    data-test="disabled-message"
-  >
-    editor.record.form.field.draft.only.disabled
-  </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-overviews/form-field-overviews.component.ts

@@ -8,13 +8,12 @@ import {
   Output,
 } from '@angular/core'
 import { GraphicOverview } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
-import { ImageInputComponent } from '../../../../../../../../../libs/ui/inputs/src'
+import { ImageInputComponent } from '../../../../../../../../../libs/ui/elements/src'
 import { PlatformServiceInterface } from '../../../../../../../../../libs/common/domain/src/lib/platform.service.interface'
 import { NotificationsService } from '../../../../../../../../../libs/feature/notifications/src'
 import { TranslateModule, TranslateService } from '@ngx-translate/core'
-import { map, Subscription } from 'rxjs'
+import { Subscription } from 'rxjs'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
-import { EditorFacade } from '../../../../+state/editor.facade'
 
 @Component({
   selector: 'gn-ui-form-field-overviews',
@@ -30,10 +29,6 @@ export class FormFieldOverviewsComponent {
   @Output() valueChange: EventEmitter<Array<GraphicOverview>> =
     new EventEmitter()
 
-  disabled$ = this.editorFacade.alreadySavedOnce$.pipe(
-    map((alreadySavedOnce) => !alreadySavedOnce)
-  )
-
   uploadProgress = undefined
   uploadSubscription: Subscription = null
 
@@ -52,8 +47,7 @@ export class FormFieldOverviewsComponent {
     private platformService: PlatformServiceInterface,
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
-    private cd: ChangeDetectorRef,
-    private editorFacade: EditorFacade
+    private cd: ChangeDetectorRef
   ) {}
 
   handleFileChange(file: File) {

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-spatial-extent/form-field-spatial-extent.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-8">
+<div class="flex flex-col gap-3">
   <gn-ui-generic-keywords
     [placeholder]="'Search for place keywords'"
     [keywords]="shownKeywords$ | async"
@@ -7,9 +7,9 @@
     (addedKeyword)="handleKeywordAdd($event)"
   >
   </gn-ui-generic-keywords>
-</div>
-<div class="w-full h-96 mt-2">
-  <gn-ui-form-field-map-container
-    [spatialExtents]="spatialExtents$ | async"
-  ></gn-ui-form-field-map-container>
+  <div class="w-full h-96 mt-2">
+    <gn-ui-form-field-map-container
+      [spatialExtents]="spatialExtents$ | async"
+    ></gn-ui-form-field-map-container>
+  </div>
 </div>