geonetwork-ui 2.6.0-dev.4fa0a0afc → 2.6.0-dev.5257edce4

package/src/libs/ui/search/src/lib/ui-search.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core'
 import { RouterLink } from '@angular/router'
-import { UtilSharedModule } from '../../../../../libs/util/shared/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective, TranslatePipe } from '@ngx-translate/core'
 import { NgxDropzoneModule } from 'ngx-dropzone'
 import { FacetsModule } from './facets/facets.module'
 import { RecordMetricComponent } from './record-metric/record-metric.component'
@@ -11,6 +10,7 @@ import { RecordPreviewRowComponent } from './record-preview-row/record-preview-r
 import { RecordPreviewTextComponent } from './record-preview-text/record-preview-text.component'
 import { RecordPreviewTitleComponent } from './record-preview-title/record-preview-title.component'
 import { ResultsHitsNumberComponent } from './results-hits-number/results-hits-number.component'
+import { ResultsHitsSearchKindComponent } from './results-hits-search-kind/results-hits-search-kind.component'
 import {
   DEFAULT_RESULTS_LAYOUT_CONFIG,
   RESULTS_LAYOUT_CONFIG,
@@ -20,14 +20,15 @@ import { RecordPreviewComponent } from './record-preview/record-preview.componen
 import { TagInputModule } from 'ngx-chips'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { ResultsListItemComponent } from './results-list-item/results-list-item.component'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import {
+  InternalLinkCardComponent,
+  KindBadgeComponent,
+  MarkdownParserComponent,
   MetadataQualityComponent,
-  UiElementsModule,
+  ThumbnailComponent,
 } from '../../../../../libs/ui/elements/src'
 import { RecordPreviewFeedComponent } from './record-preview-feed/record-preview-feed.component'
 import { CommonModule } from '@angular/common'
-import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 import { MatCheckboxModule } from '@angular/material/checkbox'
 import { InteractiveTableComponent } from '../../../../../libs/ui/layout/src'
 import { NgIconsModule, provideNgIconsConfig } from '@ng-icons/core'
@@ -37,6 +38,8 @@ import {
   matMapOutline,
 } from '@ng-icons/material-icons/outline'
 import { matFace } from '@ng-icons/material-icons/baseline'
+import { InlineFilterComponent } from '../../../../../libs/ui/inputs/src'
+import { ActionMenuComponent } from './results-table/action-menu/action-menu.component'
 
 @NgModule({
   declarations: [
@@ -48,22 +51,20 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     RecordMetricComponent,
     ResultsListComponent,
     ResultsHitsNumberComponent,
+    ResultsHitsSearchKindComponent,
     ResultsListItemComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
   ],
   imports: [
     CommonModule,
-    TranslateModule.forChild(),
+    TranslateDirective,
+    TranslatePipe,
     NgxDropzoneModule,
     FacetsModule,
     FormsModule,
     ReactiveFormsModule,
     TagInputModule,
-    UtilSharedModule,
-    UiWidgetsModule,
-    UiInputsModule,
-    UiElementsModule,
     MatCheckboxModule,
     RouterLink,
     InteractiveTableComponent,
@@ -74,7 +75,13 @@ import { matFace } from '@ng-icons/material-icons/baseline'
       matFace,
       matHomeWorkOutline,
     }),
+    KindBadgeComponent,
     MetadataQualityComponent,
+    InlineFilterComponent,
+    ThumbnailComponent,
+    MarkdownParserComponent,
+    InternalLinkCardComponent,
+    ActionMenuComponent,
   ],
   exports: [
     RecordPreviewListComponent,
@@ -86,8 +93,10 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     FacetsModule,
     RecordPreviewComponent,
     ResultsHitsNumberComponent,
+    ResultsHitsSearchKindComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
+    ActionMenuComponent,
   ],
   providers: [
     provideNgIconsConfig({

package/src/libs/ui/widgets/src/index.ts

@@ -1,4 +1,3 @@
-export * from './lib/ui-widgets.module'
 export * from './lib/progress-bar/progress-bar.component'
 export * from './lib/popover/popover.component'
 export * from './lib/loading-mask/loading-mask.component'

package/src/libs/ui/widgets/src/lib/color-scale/color-scale.component.ts

@@ -4,5 +4,6 @@ import { Component } from '@angular/core'
   selector: 'gn-ui-color-scale',
   templateUrl: './color-scale.component.html',
   styleUrls: ['./color-scale.component.css'],
+  standalone: true,
 })
 export class ColorScaleComponent {}

package/src/libs/ui/widgets/src/lib/progress-bar/progress-bar.component.html

@@ -3,16 +3,17 @@
   <ng-container *ngSwitchCase="'light'">
     <div class="flex items-center relative">
       <div
-        class="flex-shrink-0 {{ color.text }} text-xs font-medium mr-2
+        class="flex-shrink-0 {{ color.text }} font-medium mr-2
              text-opacity-100 !text-slate-800"
+        data-cy="progressPercentage"
       >
         {{ progress }}%
       </div>
-      <div class="flex-grow h-[6px] w-full {{ color.outerBar }} rounded-full">
+      <div class="flex-grow h-[4px] w-[52px] {{ color.outerBar }} rounded-full">
         <div
           [style.width.%]="progress"
           class="{{ color.innerBar }} transition-width duration-500
-               ease-in-out rounded-full shadow-sm h-full"
+               ease-in-out rounded-full shadow-sm w-[52px] h-[4px]"
         ></div>
       </div>
     </div>

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

@@ -18,7 +18,6 @@ import {
 import { TranslateCompiler, TranslateLoader } from '@ngx-translate/core'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
 import { HttpClient } from '@angular/common/http'
-import { DEFAULT_LANG } from '../../../../../libs/util/i18n/src'
 import { FileWithOverridesTranslateLoader } from './i18n/file-with-overrides.translate.loader'
 
 const MISSING_CONFIG_ERROR = `Application configuration was not initialized correctly.
@@ -99,6 +98,7 @@ export function loadAppConfig() {
           'metadata_language',
           'login_url',
           'logout_url',
+          'settings_url',
           'web_component_embedder_url',
           'languages',
           'contact_email',
@@ -307,7 +307,6 @@ export const TRANSLATE_WITH_OVERRIDES_CONFIG = {
     useFactory: function HttpLoaderFactory(http: HttpClient) {
       return new FileWithOverridesTranslateLoader(http, './assets/i18n/')
     },
-    defaultLanguage: DEFAULT_LANG,
     deps: [HttpClient],
   },
 }

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

@@ -7,6 +7,7 @@ proxy_path = "/proxy/?url="
 metadata_language = "fre"
 login_url = "/cas/login?service="
 logout_url = "/geonetwork/signout"
+settings_url = "/geonetwork/settings"
 web_component_embedder_url = "/datahub/wc-embedder.html"
 
 [map]

package/src/libs/util/i18n/src/index.ts

@@ -1,7 +1,6 @@
-export * from './lib/util-i18n.module'
+export * from './lib/i18n.providers'
 export * from './lib/i18n.constants'
 export * from './lib/i18n.interceptor'
-export * from './lib/lang.service'
 export * from './lib/file.translate.loader'
 export * from './lib/embedded.translate.loader'
 export * from './lib/translate.loader.utils'

package/src/libs/util/i18n/src/lib/embedded.translate.loader.ts

@@ -1,5 +1,5 @@
 import { TranslateLoader } from '@ngx-translate/core'
-import { Observable, map, of } from 'rxjs'
+import { map, Observable, of } from 'rxjs'
 import { dropEmptyTranslations } from './translate.loader.utils'
 import de from '../../../../../translations/de.json'
 import en from '../../../../../translations/en.json'
@@ -8,10 +8,11 @@ import fr from '../../../../../translations/fr.json'
 import it from '../../../../../translations/it.json'
 import nl from '../../../../../translations/nl.json'
 import pt from '../../../../../translations/pt.json'
+import sk from '../../../../../translations/sk.json'
 
 export class EmbeddedTranslateLoader implements TranslateLoader {
-  getTranslation(lang: string): Observable<any> {
-    const langs = { de, en, es, fr, it, nl, pt }
+  getTranslation(lang: string): Observable<Record<string, string>> {
+    const langs = { de, en, es, fr, it, nl, pt, sk }
     const translations = langs[lang.substring(0, 2)]
     return of(translations).pipe(map(dropEmptyTranslations))
   }

package/src/libs/util/i18n/src/lib/i18n.constants.ts

@@ -1,24 +1,14 @@
 import { HttpClient } from '@angular/common/http'
-import { TranslateCompiler, TranslateLoader } from '@ngx-translate/core'
 import { TranslateMessageFormatCompiler } from 'ngx-translate-messageformat-compiler'
 import { FileTranslateLoader } from './file.translate.loader'
-import { marker } from '@biesbjerg/ngx-translate-extract-marker'
-
-marker('language.en')
-marker('language.nl')
-marker('language.fr')
-marker('language.de')
-marker('language.ko')
-marker('language.es')
-marker('language.cs')
-marker('language.ca')
-marker('language.fi')
-marker('language.is')
-marker('language.it')
-marker('language.pt')
-marker('language.ru')
-marker('language.zh')
-marker('language.sk')
+import {
+  TranslateCompiler,
+  TranslateDefaultParser,
+  TranslateLoader,
+  TranslateModuleConfig,
+  TranslateParser,
+} from '@ngx-translate/core'
+import { Injectable } from '@angular/core'
 
 export const DEFAULT_LANG = 'en'
 
@@ -28,20 +18,40 @@ export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 export function HttpLoaderFactory(http: HttpClient) {
   return new FileTranslateLoader(http, './assets/i18n/')
 }
-//Deprecated, but currently still used in datafeeder
-export function getLangFromBrowser() {
-  return navigator.language.substr(0, 2)
-}
-const COMPILER_CONFIG = {
-  provide: TranslateCompiler,
-  useClass: TranslateMessageFormatCompiler,
-}
-export const TRANSLATE_DEFAULT_CONFIG = {
-  compiler: COMPILER_CONFIG,
+
+export const TRANSLATE_DEFAULT_CONFIG: TranslateModuleConfig = {
+  compiler: {
+    provide: TranslateCompiler,
+    useClass: TranslateMessageFormatCompiler,
+  },
   loader: {
     provide: TranslateLoader,
     useFactory: HttpLoaderFactory,
-    defaultLanguage: DEFAULT_LANG,
     deps: [HttpClient],
   },
 }
+
+@Injectable()
+class DebugTranslateParser extends TranslateDefaultParser {
+  interpolate(expr: string | (() => string), params?: any): string | undefined {
+    if (!params) return expr?.toString()
+    const paramsStr = Object.keys(params)
+      .map((key) => `${key}=${params[key]}`)
+      .join(', ')
+    return `${expr} {{${paramsStr}}}`
+  }
+}
+
+/**
+ * This config will print translation keys in the UI directly; used to identify which keys are used
+ */
+export const TRANSLATE_DEBUG_CONFIG: TranslateModuleConfig = {
+  compiler: {
+    provide: TranslateCompiler,
+    useClass: TranslateMessageFormatCompiler,
+  },
+  parser: {
+    provide: TranslateParser,
+    useClass: DebugTranslateParser,
+  },
+}

package/src/libs/util/i18n/src/lib/i18n.interceptor.ts

@@ -1,25 +1,27 @@
-import { Injectable } from '@angular/core'
 import {
-  HttpRequest,
-  HttpHandler,
   HttpEvent,
+  HttpHandler,
   HttpInterceptor,
+  HttpRequest,
 } from '@angular/common/http'
-import { TranslateService } from '@ngx-translate/core'
-import { Observable } from 'rxjs'
 import { DEFAULT_LANG } from './i18n.constants'
+import { Observable } from 'rxjs'
+import { Injectable, Injector } from '@angular/core'
+import { TranslateService } from '@ngx-translate/core'
 
 @Injectable()
 export class I18nInterceptor implements HttpInterceptor {
-  constructor(private translate: TranslateService) {}
+  constructor(private injector: Injector) {}
 
   intercept(
-    request: HttpRequest<any>,
+    request: HttpRequest<unknown>,
     next: HttpHandler
-  ): Observable<HttpEvent<any>> {
+  ): Observable<HttpEvent<unknown>> {
+    // we're injecting the service only when necessary to avoid circular dependencies
+    const translate = this.injector.get(TranslateService)
     request = request.clone({
       setHeaders: {
-        'Accept-Language': this.translate.currentLang || DEFAULT_LANG,
+        'Accept-Language': translate.currentLang || DEFAULT_LANG,
       },
     })
     return next.handle(request)

package/src/libs/util/i18n/src/lib/i18n.providers.ts

@@ -0,0 +1,68 @@
+import {
+  APP_INITIALIZER,
+  EnvironmentProviders,
+  makeEnvironmentProviders,
+  Provider,
+} from '@angular/core'
+import {
+  provideTranslateService,
+  TranslateModuleConfig,
+  TranslateService,
+} from '@ngx-translate/core'
+import {
+  DEFAULT_LANG,
+  LANGUAGE_STORAGE_KEY,
+  TRANSLATE_DEBUG_CONFIG,
+  TRANSLATE_DEFAULT_CONFIG,
+} from './i18n.constants'
+import {
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http'
+import { I18nInterceptor } from './i18n.interceptor'
+
+function i18nInitializerFromLocalStorageFactory(translate: TranslateService) {
+  return () => {
+    translate.setDefaultLang(DEFAULT_LANG)
+    let storageLang = null
+    try {
+      storageLang = localStorage.getItem(LANGUAGE_STORAGE_KEY)
+    } catch (error) {
+      console.warn(error)
+    }
+    translate.use(storageLang || translate.getBrowserLang() || DEFAULT_LANG)
+  }
+}
+
+export function provideI18n(
+  config?: TranslateModuleConfig,
+  useLocalStorage = true
+): EnvironmentProviders {
+  // fallback to default config
+  let usedConfig = config ?? TRANSLATE_DEFAULT_CONFIG
+  // if the URL contains ?debugTranslations=true, show translations keys in the UI
+  if (
+    new URL(window.location.toString()).searchParams.get(
+      'debugTranslations'
+    ) === 'true'
+  ) {
+    usedConfig = TRANSLATE_DEBUG_CONFIG
+  }
+
+  const providers: (EnvironmentProviders | Provider)[] = [
+    provideHttpClient(withInterceptorsFromDi()),
+    { provide: HTTP_INTERCEPTORS, useClass: I18nInterceptor, multi: true },
+    provideTranslateService(usedConfig),
+  ]
+  if (useLocalStorage) {
+    providers.push({
+      provide: APP_INITIALIZER,
+      useFactory: i18nInitializerFromLocalStorageFactory,
+      deps: [TranslateService],
+      multi: true,
+    })
+  }
+
+  return makeEnvironmentProviders(providers)
+}

package/src/libs/util/i18n/src/lib/language-codes.ts

@@ -1,4 +1,6 @@
-export const LANG_3_TO_2_MAPPER = {
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+
+const LANG_3_TO_2_MAPPER = {
   eng: 'en',
   dut: 'nl',
   fre: 'fr',
@@ -15,6 +17,17 @@ export const LANG_3_TO_2_MAPPER = {
   chi: 'zh',
   slo: 'sk',
   roh: 'rm',
+  ara: 'ar',
+  dan: 'da',
+  nor: 'no',
+  pol: 'pl',
+  swe: 'sv',
+  tur: 'tr',
+  arm: 'hy',
+  aze: 'az',
+  geo: 'ka',
+  ukr: 'uk',
+  wel: 'cy',
 }
 
 export const LANGUAGE_NAMES = {
@@ -33,7 +46,18 @@ export const LANGUAGE_NAMES = {
   ru: 'Русский',
   zh: '中文',
   sk: 'Slovenčina',
-  roh: 'Rumantsch',
+  rm: 'Rumantsch',
+  ar: 'العربية',
+  da: 'Dansk',
+  no: 'Norsk',
+  pl: 'Polski',
+  sv: 'Swedish',
+  tr: 'Türkçe',
+  hy: 'հայերեն',
+  az: 'Azərbaycan dili',
+  ka: 'ქართული',
+  uk: 'українська',
+  wel: 'Cymraeg',
 }
 
 export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
@@ -42,3 +66,44 @@ export const LANG_2_TO_3_MAPPER = Object.entries(LANG_3_TO_2_MAPPER).reduce(
   },
   {}
 )
+
+export function getLang3FromLang2(lang2: string): string {
+  return LANG_2_TO_3_MAPPER[lang2] ?? lang2
+}
+
+export function getLang2FromLang3(lang3: string): string {
+  return LANG_3_TO_2_MAPPER[lang3] ?? lang3
+}
+
+export function getLocalizedIndexKey(lang2: string): string {
+  const lang3 = getLang3FromLang2(lang2)
+  return lang3 ? `lang${lang3}` : null
+}
+
+marker('language.en')
+marker('language.nl')
+marker('language.fr')
+marker('language.de')
+marker('language.ko')
+marker('language.es')
+marker('language.cs')
+marker('language.ca')
+marker('language.fi')
+marker('language.is')
+marker('language.it')
+marker('language.pt')
+marker('language.ru')
+marker('language.zh')
+marker('language.sk')
+marker('language.rm')
+marker('language.ar')
+marker('language.da')
+marker('language.no')
+marker('language.pl')
+marker('language.sv')
+marker('language.tr')
+marker('language.hy')
+marker('language.az')
+marker('language.ka')
+marker('language.uk')
+marker('language.cy')

package/src/libs/util/shared/src/index.ts

@@ -1,5 +1,6 @@
-export * from './lib/util-shared.module'
 export * from './lib/services'
 export * from './lib/utils'
 export * from './lib/links'
 export * from './lib/image-fallback.directive'
+export * from './lib/gn-ui-version'
+export * from './lib/record.util'

package/src/libs/util/shared/src/lib/gn-ui-version.ts

@@ -0,0 +1,8 @@
+import packageJson from '../../../../../package.json'
+
+export const GEONETWORK_UI_VERSION = packageJson.version
+
+export const GEONETWORK_UI_TAG_NAME =
+  GEONETWORK_UI_VERSION.split('-')[1] === 'dev'
+    ? 'main'
+    : `v${packageJson.version}`

package/src/libs/util/shared/src/lib/image-fallback.directive.ts

@@ -2,6 +2,7 @@ import { Directive, ElementRef, HostListener, Input } from '@angular/core'
 
 @Directive({
   selector: 'img[gnUiImageFallback]',
+  standalone: true,
 })
 export class ImageFallbackDirective {
   @Input() fallbackUrl: string

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

@@ -1,5 +1,8 @@
 import { Injectable } from '@angular/core'
-import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetOnlineResource,
+  ServiceOnlineResource,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 import { getFileFormat } from './link-utils'
 
 export enum LinkUsage {
@@ -16,8 +19,11 @@ export enum LinkUsage {
   providedIn: 'root',
 })
 export class LinkClassifierService {
-  getUsagesForLink(link: DatasetOnlineResource): LinkUsage[] {
+  getUsagesForLink(
+    link: DatasetOnlineResource | ServiceOnlineResource
+  ): LinkUsage[] {
     switch (link.type) {
+      case 'endpoint':
       case 'service': {
         switch (link.accessServiceProtocol) {
           case 'esriRest':
@@ -25,7 +31,10 @@ export class LinkClassifierService {
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'wms':
           case 'wmts':
+          case 'tms':
             return [LinkUsage.API, LinkUsage.MAP_API]
+          case 'maplibre-style':
+            return [LinkUsage.GEODATA]
           case 'ogcFeatures':
             return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           case 'GPFDL':
@@ -54,7 +63,10 @@ export class LinkClassifierService {
     }
   }
 
-  hasUsage(link: DatasetOnlineResource, usage: LinkUsage) {
+  hasUsage(
+    link: DatasetOnlineResource | ServiceOnlineResource,
+    usage: LinkUsage
+  ) {
     return this.getUsagesForLink(link).indexOf(usage) > -1
   }
 }

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

@@ -1,6 +1,7 @@
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import {
   DatasetOnlineResource,
+  ServiceOnlineResource,
   ServiceProtocol,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import {
@@ -140,7 +141,9 @@ export function getFormatPriority(linkFormat: FileFormat): number {
   return 0
 }
 
-export function getLinkPriority(link: DatasetOnlineResource): number {
+export function getLinkPriority(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): number {
   return getFormatPriority(getFileFormat(link))
 }
 
@@ -164,7 +167,9 @@ export function getFileFormatFromServiceOutput(
   return null
 }
 
-export function getFileFormat(link: DatasetOnlineResource): FileFormat {
+export function getFileFormat(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): FileFormat {
   if ('mimeType' in link) {
     const mimeTypeFormat = mimeTypeToFormat(link.mimeType)
     if (mimeTypeFormat !== null) {
@@ -181,7 +186,7 @@ export function getFileFormat(link: DatasetOnlineResource): FileFormat {
 }
 
 export function isFormatInQueryParam(
-  link: DatasetOnlineResource,
+  link: DatasetOnlineResource | ServiceOnlineResource,
   alias: string
 ): boolean {
   const queryParams = link.url.searchParams
@@ -203,7 +208,7 @@ export function mimeTypeToFormat(mimeType: string): FileFormat {
 }
 
 export function checkFileFormat(
-  link: DatasetOnlineResource,
+  link: DatasetOnlineResource | ServiceOnlineResource,
   format: FileFormat
 ): boolean {
   return (
@@ -225,7 +230,9 @@ export function getBadgeColor(linkFormat: FileFormat): string {
   return 'var(--color-gray-700)' // Default color ?
 }
 
-export function getLinkLabel(link: DatasetOnlineResource): string {
+export function getLinkLabel(
+  link: DatasetOnlineResource | ServiceOnlineResource
+): string {
   let format = ''
   switch (link.type) {
     case 'service':
@@ -240,6 +247,9 @@ export function getLinkLabel(link: DatasetOnlineResource): string {
           case 'wmts':
             format = 'WMTS'
             break
+          case 'tms':
+            format = 'TMS'
+            break
           case 'esriRest':
             format = 'REST'
             break
@@ -249,7 +259,7 @@ export function getLinkLabel(link: DatasetOnlineResource): string {
     default:
       format = getFileFormat(link)
   }
-  const label = link.description || link.name
+  const label = link.description || ('name' in link ? link.name : '')
   return format ? `${label} (${format})` : label
 }
 
@@ -261,14 +271,25 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
     }
     case 'wfs': {
       const endpointWfs = await new WfsEndpoint(url).isReady()
-      return endpointWfs.getFeatureTypes()
+      const featureTypes = await endpointWfs.getFeatureTypes()
+      const layers = await Promise.all(
+        featureTypes.map(async (collection) => {
+          return await endpointWfs.getFeatureTypeFull(collection.name)
+        })
+      )
+      return layers
     }
     case 'wms': {
       const endpointWms = await new WmsEndpoint(url).isReady()
-      return endpointWms
-        .getLayers()
-        .flatMap(wmsLayerFlatten)
-        .filter((l) => l.name)
+      const layers = (
+        await endpointWms
+          .getLayers()
+          .flatMap(wmsLayerFlatten)
+          .filter((l) => l.name)
+      ).map((collection) => {
+        return endpointWms.getLayerByName(collection.name)
+      })
+      return layers
     }
     case 'wmts': {
       const endpointWmts = await new WmtsEndpoint(url).isReady()
@@ -279,7 +300,7 @@ export async function getLayers(url: string, serviceProtocol: ServiceProtocol) {
   }
 }
 
-function wmsLayerFlatten(layerFull) {
+export function wmsLayerFlatten(layerFull) {
   const layer = {
     title: layerFull.title,
     name: layerFull.name,