geonetwork-ui 2.11.0-dev.bc1a6d4e2 → 2.11.0-dev.bd615f629

package/src/libs/ui/elements/src/lib/service-capabilities/service-capabilities.component.ts

@@ -128,7 +128,8 @@ export class ServiceCapabilitiesComponent implements OnInit {
       this.loading = true
       this.availableLayers = await getLayers(
         this.apiLinks[0].url.href,
-        this.apiLinks[0].accessServiceProtocol
+        this.apiLinks[0].accessServiceProtocol,
+        true
       )
       this.loading = false
       this.cdr.detectChanges()

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.component.html

@@ -20,10 +20,13 @@
       </div>
     }
   </div>
-  <button class="h-6 w-6" data-test="dropdown-clear">
+  <button
+    class="h-6 w-6 flex items-center justify-center"
+    data-test="dropdown-clear"
+  >
     @if (hasSelectedChoices && !overlayOpen) {
       <ng-icon
-        class="shrink-0 opacity-40 mr-1.5 hover:opacity-80 transition-colors clear-btn"
+        class="shrink-0 opacity-40 hover:opacity-80 transition-colors clear-btn"
         (click)="clearSelection($event)"
         name="matClose"
       ></ng-icon>
@@ -61,13 +64,13 @@
     #overlayContainer
   >
     <div
-      class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row gap-[2px] flex-wrap p-2 focus-within:rounded focus-within:border-2 focus-within:border-primary"
+      class="border border-gray-300 rounded mb-2 mx-2 min-h-[44px] flex flex-row gap-1 flex-wrap p-2 focus-within:rounded focus-within:border-2 focus-within:border-primary"
     >
       @for (selected of selectedChoices; track selected) {
         <button
           type="button"
           [title]="selected.label"
-          class="max-w-full bg-main text-white rounded pr-[7px] flex gap-1 items-center opacity-70 hover:opacity-100 focus:opacity-100 transition-opacity mb-1"
+          class="max-w-full bg-main text-white rounded pr-[7px] flex gap-1 items-center opacity-70 hover:opacity-100 focus:opacity-100 transition-opacity"
           (click)="select(selected, false)"
         >
           <div class="text-sm truncate leading-[26px] px-2">

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

@@ -24,7 +24,7 @@ import {
   propagateToDocumentOnly,
 } from '../../../../../../libs/util/shared/src'
 import { ButtonComponent } from '../button/button.component'
-import { NgIcon, provideIcons } from '@ng-icons/core'
+import { NgIcon, provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 import { FormsModule } from '@angular/forms'
 import { TranslatePipe } from '@ngx-translate/core'
 
@@ -46,19 +46,22 @@ import {
       matExpandMore,
       matExpandLess,
     }),
+    provideNgIconsConfig({
+      size: '1.5rem',
+    }),
   ],
   standalone: true,
 })
-export class DropdownMultiselectComponent {
+export class DropdownMultiselectComponent<T = unknown> {
   private scrollStrategies = inject(ScrollStrategyOptions)
 
   @Input() title: string
-  @Input() choices: Choice[]
-  @Input() selected: unknown[] = []
+  @Input() choices: Choice<T>[]
+  @Input() selected: T[] = []
   @Input() allowSearch = true
   @Input() maxRows: number
   @Input() searchInputValue = ''
-  @Output() selectValues = new EventEmitter<unknown[]>()
+  @Output() selectValues = new EventEmitter<T[]>()
   @ViewChild('overlayOrigin') overlayOrigin: CdkOverlayOrigin
   @ViewChild(CdkConnectedOverlay) overlay: CdkConnectedOverlay
   @ViewChild('overlayContainer', { read: ElementRef })
@@ -115,7 +118,7 @@ export class DropdownMultiselectComponent {
 
   private setFocus() {
     setTimeout(() => {
-      this.searchFieldInput.nativeElement.focus()
+      this.searchFieldInput?.nativeElement.focus()
     }, 0)
   }
 
@@ -194,18 +197,18 @@ export class DropdownMultiselectComponent {
     this.checkboxes.get(newIndex).nativeElement.focus()
   }
 
-  isSelected(choice: Choice) {
+  isSelected(choice: Choice<T>) {
     return this.selected.indexOf(choice.value) > -1
   }
 
-  select(choice: Choice, selected: boolean) {
+  select(choice: Choice<T>, selected: boolean) {
     this.selected = selected
       ? [...this.selected.filter((v) => v !== choice.value), choice.value]
       : this.selected.filter((v) => v !== choice.value)
     this.selectValues.emit(this.selected)
   }
 
-  toggle(choice: Choice) {
+  toggle(choice: Choice<T>) {
     this.select(choice, !this.isSelected(choice))
   }
 

package/src/libs/ui/inputs/src/lib/dropdown-multiselect/dropdown-multiselect.model.ts

@@ -1,4 +1,4 @@
-export interface Choice {
-  value: unknown
+export interface Choice<T = unknown> {
+  value: T
   label: string
 }

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -344,7 +344,11 @@ export function getLinkLabel(
   return format ? `${label} (${format})` : label
 }
 
-export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
+export async function getLayers(
+  url: string,
+  serviceProtocol: ServiceProtocol,
+  deep = false
+) {
   switch (serviceProtocol) {
     case 'ogcFeatures': {
       const layers = await new OgcApiEndpoint(url).allCollections
@@ -352,7 +356,10 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
     }
     case 'wfs': {
       const endpointWfs = await new WfsEndpoint(url).isReady()
-      const featureTypes = await endpointWfs.getFeatureTypes()
+      const featureTypes = endpointWfs.getFeatureTypes()
+      if (!deep) {
+        return featureTypes
+      }
       const layers = (
         await Promise.allSettled(
           featureTypes.map((collection) => {
@@ -366,14 +373,16 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
     }
     case 'wms': {
       const endpointWms = await new WmsEndpoint(url).isReady()
-      const layers = (
-        await endpointWms
-          .getLayers()
-          .flatMap(wmsLayerFlatten)
-          .filter((l) => l.name)
-      ).map((collection) => {
-        return endpointWms.getLayerByName(collection.name)
-      })
+      const layersSummary = endpointWms
+        .getLayers()
+        .flatMap(wmsLayerFlatten)
+        .filter((l) => l.name)
+      if (!deep) {
+        return layersSummary
+      }
+      const layers = layersSummary.map((collection) =>
+        endpointWms.getLayerByName(collection.name)
+      )
       return layers
     }
     case 'wmts': {

package/translations/de.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "Wiederverwendungen",
   "search.filters.recordKind.service": "Dienste",
   "search.filters.representationType": "Repräsentationstyp",
+  "search.filters.resourceCreationRevisionDate": "Ressourcendatum",
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "Standard",
   "search.filters.summaryLabel.changeDate": "Geändert am: ",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "Ressourcendatum: ",
   "search.filters.summaryLabel.user": "Geändert von: ",
   "search.filters.title": "Ergebnisse filtern",
   "search.filters.topic": "Themen",

package/translations/en.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "Reuses",
   "search.filters.recordKind.service": "Services",
   "search.filters.representationType": "Representation type",
+  "search.filters.resourceCreationRevisionDate": "Resource date",
   "search.filters.resourceType": "Resource type",
   "search.filters.spatialExtent": "Spatial extent",
   "search.filters.spatialExtent.bboxFromFile": "extent from {fileName}",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "Import a GeoJSON",
   "search.filters.standard": "Standard",
   "search.filters.summaryLabel.changeDate": "Updated: ",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "Resource date: ",
   "search.filters.summaryLabel.user": "Editor: ",
   "search.filters.title": "Filter your results",
   "search.filters.topic": "Topics",

package/translations/es.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "",
   "search.filters.recordKind.service": "",
   "search.filters.representationType": "",
+  "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "",
   "search.filters.summaryLabel.changeDate": "",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "",
   "search.filters.summaryLabel.user": "",
   "search.filters.title": "",
   "search.filters.topic": "",

package/translations/fr.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "Réutilisations",
   "search.filters.recordKind.service": "Services",
   "search.filters.representationType": "Type de représentation",
+  "search.filters.resourceCreationRevisionDate": "Date de la ressource",
   "search.filters.resourceType": "Type de ressource",
   "search.filters.spatialExtent": "Étendue spatiale",
   "search.filters.spatialExtent.bboxFromFile": "étendue de {fileName}",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "Importer un GeoJSON",
   "search.filters.standard": "Standard",
   "search.filters.summaryLabel.changeDate": "Mise à jour : ",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "Date de la ressource : ",
   "search.filters.summaryLabel.user": "Éditeur : ",
   "search.filters.title": "Affiner votre recherche",
   "search.filters.topic": "Thèmes",

package/translations/it.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "Riutilizzi",
   "search.filters.recordKind.service": "Servizi",
   "search.filters.representationType": "Tipo di rappresentazione",
+  "search.filters.resourceCreationRevisionDate": "Data della risorsa",
   "search.filters.resourceType": "Tipo di risorsa",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "Standard",
   "search.filters.summaryLabel.changeDate": "Aggiornato: ",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "Data della risorsa: ",
   "search.filters.summaryLabel.user": "Editor: ",
   "search.filters.title": "Affina la sua ricerca",
   "search.filters.topic": "Argomenti",

package/translations/nl.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "",
   "search.filters.recordKind.service": "",
   "search.filters.representationType": "",
+  "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "",
   "search.filters.summaryLabel.changeDate": "",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "",
   "search.filters.summaryLabel.user": "",
   "search.filters.title": "",
   "search.filters.topic": "",

package/translations/pt.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "",
   "search.filters.recordKind.service": "",
   "search.filters.representationType": "",
+  "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "",
   "search.filters.summaryLabel.changeDate": "",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "",
   "search.filters.summaryLabel.user": "",
   "search.filters.title": "",
   "search.filters.topic": "",

package/translations/sk.json

@@ -690,6 +690,7 @@
   "search.filters.recordKind.reuse": "",
   "search.filters.recordKind.service": "",
   "search.filters.representationType": "Typ reprezentácie",
+  "search.filters.resourceCreationRevisionDate": "",
   "search.filters.resourceType": "Typ zdroja",
   "search.filters.spatialExtent": "",
   "search.filters.spatialExtent.bboxFromFile": "",
@@ -704,6 +705,7 @@
   "search.filters.spatialExtent.import": "",
   "search.filters.standard": "Štandard",
   "search.filters.summaryLabel.changeDate": "",
+  "search.filters.summaryLabel.resourceCreationRevisionDate": "",
   "search.filters.summaryLabel.user": "",
   "search.filters.title": "Filtrovanie výsledkov",
   "search.filters.topic": "Témy",