geonetwork-ui 2.6.0-dev.9df114cd4 → 2.6.0-dev.a0bd52a21

package/src/libs/ui/search/src/lib/results-table/results-table.component.ts

@@ -28,18 +28,14 @@ import {
   getFileFormat,
   getFormatPriority,
 } from '../../../../../../libs/util/shared/src'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateModule, TranslateService } from '@ngx-translate/core'
 import { ActionMenuComponent } from './action-menu/action-menu.component'
 import { NgIconComponent, provideIcons } from '@ng-icons/core'
-import { iconoirUser, iconoirLock } from '@ng-icons/iconoir'
-import {
-  CdkConnectedOverlay,
-  CdkOverlayOrigin,
-  Overlay,
-  OverlayRef,
-} from '@angular/cdk/overlay'
+import { iconoirUser, iconoirLock, iconoirTranslate } from '@ng-icons/iconoir'
+import { CdkOverlayOrigin, Overlay, OverlayRef } from '@angular/cdk/overlay'
 import { TemplatePortal } from '@angular/cdk/portal'
 import { matMoreVert } from '@ng-icons/material-icons/baseline'
+import { Observable, of, take } from 'rxjs'
 
 @Component({
   selector: 'gn-ui-results-table',
@@ -57,7 +53,9 @@ import { matMoreVert } from '@ng-icons/material-icons/baseline'
     NgIconComponent,
     CdkOverlayOrigin,
   ],
-  providers: [provideIcons({ iconoirUser, iconoirLock, matMoreVert })],
+  providers: [
+    provideIcons({ iconoirUser, iconoirLock, iconoirTranslate, matMoreVert }),
+  ],
 })
 export class ResultsTableComponent {
   @Input() records: CatalogRecord[] = []
@@ -65,7 +63,10 @@ export class ResultsTableComponent {
   @Input() sortOrder: SortByField = null
   @Input() hasDraft: (record: CatalogRecord) => boolean = () => false
   @Input() canDuplicate: (record: CatalogRecord) => boolean = () => true
-  @Input() canDelete: (record: CatalogRecord) => boolean = () => true
+  @Input() canDelete: (record: CatalogRecord) => Observable<boolean> = () =>
+    of(true)
+  @Input() canEdit: (record: CatalogRecord) => Observable<boolean> = () =>
+    of(true)
   @Input() isDraftPage = false
   @Input() isDuplicating = false
 
@@ -89,7 +90,8 @@ export class ResultsTableComponent {
     private overlay: Overlay,
     private viewContainerRef: ViewContainerRef,
     private cdr: ChangeDetectorRef,
-    private dateService: DateService
+    private dateService: DateService,
+    private translateService: TranslateService
   ) {}
 
   openActionMenu(item, template) {
@@ -173,9 +175,14 @@ export class ResultsTableComponent {
     return getBadgeColor(format)
   }
 
-  handleRecordClick(item: CatalogRecord) {
-    if (item?.extras?.edit || this.isDraftPage)
-      this.recordClick.emit(item as CatalogRecord)
+  handleRecordClick(item: unknown) {
+    this.canEdit(item as CatalogRecord)
+      .pipe(take(1))
+      .subscribe((canEdit) => {
+        if (canEdit) {
+          this.recordClick.emit(item as CatalogRecord)
+        }
+      })
   }
 
   handleDuplicate(item: unknown) {
@@ -218,4 +225,16 @@ export class ResultsTableComponent {
   handleRecordSelectedChange(selected: boolean, record: CatalogRecord) {
     this.recordsSelectedChange.emit([[record], selected])
   }
+
+  isMultilingual(record: CatalogRecord): boolean {
+    return record.otherLanguages.length > 0
+  }
+
+  getTxtHoverMultilingual(record: CatalogRecord) {
+    return this.translateService.instant('dashboard.records.isMultilingual', {
+      languages: [...[record.defaultLanguage], ...record.otherLanguages].join(
+        ', '
+      ),
+    })
+  }
 }

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

@@ -11,6 +11,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,
@@ -24,6 +25,7 @@ import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import {
   MetadataQualityComponent,
   UiElementsModule,
+  KindBadgeComponent,
 } from '../../../../../libs/ui/elements/src'
 import { RecordPreviewFeedComponent } from './record-preview-feed/record-preview-feed.component'
 import { CommonModule } from '@angular/common'
@@ -37,6 +39,7 @@ import {
   matMapOutline,
 } from '@ng-icons/material-icons/outline'
 import { matFace } from '@ng-icons/material-icons/baseline'
+import { ActionMenuComponent } from './results-table/action-menu/action-menu.component'
 
 @NgModule({
   declarations: [
@@ -48,6 +51,7 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     RecordMetricComponent,
     ResultsListComponent,
     ResultsHitsNumberComponent,
+    ResultsHitsSearchKindComponent,
     ResultsListItemComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
@@ -74,7 +78,9 @@ import { matFace } from '@ng-icons/material-icons/baseline'
       matFace,
       matHomeWorkOutline,
     }),
+    KindBadgeComponent,
     MetadataQualityComponent,
+    ActionMenuComponent,
   ],
   exports: [
     RecordPreviewListComponent,
@@ -86,8 +92,10 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     FacetsModule,
     RecordPreviewComponent,
     ResultsHitsNumberComponent,
+    ResultsHitsSearchKindComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
+    ActionMenuComponent,
   ],
   providers: [
     provideNgIconsConfig({

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

@@ -3,8 +3,9 @@
   <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>

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

@@ -99,6 +99,7 @@ export function loadAppConfig() {
           'metadata_language',
           'login_url',
           'logout_url',
+          'settings_url',
           'web_component_embedder_url',
           'languages',
           'contact_email',

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/lib/i18n.constants.ts

@@ -19,12 +19,54 @@ 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')
 
 export const DEFAULT_LANG = 'en'
 
 // Caution: changing this can break language selection from third parties!
 export const LANGUAGE_STORAGE_KEY = 'geonetwork-ui-language'
 
+export const SUPPORTED_LANGUAGES = [
+  'en',
+  'nl',
+  'fr',
+  'de',
+  'ko',
+  'es',
+  'cs',
+  'ca',
+  'fi',
+  'is',
+  'it',
+  'pt',
+  'ru',
+  'zh',
+  'sk',
+  'rm',
+  'ar',
+  'da',
+  'no',
+  'pl',
+  'sv',
+  'tr',
+  'hy',
+  'az',
+  'ka',
+  'uk',
+  'cy',
+]
+
 export function HttpLoaderFactory(http: HttpClient) {
   return new FileTranslateLoader(http, './assets/i18n/')
 }

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

@@ -15,6 +15,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 +44,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(

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

@@ -3,3 +3,4 @@ export * from './lib/services'
 export * from './lib/utils'
 export * from './lib/links'
 export * from './lib/image-fallback.directive'
+export * from './lib/gn-ui-version'

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/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,

package/tailwind.base.config.js

@@ -1,6 +1,9 @@
 module.exports = {
   theme: {
     extend: {
+      screens: {
+        xs: '320px',
+      },
       colors: {
         'primary-white': 'var(--color-primary-white)',
         'primary-lightest': 'var(--color-primary-lightest)',

package/tailwind.base.css

@@ -94,8 +94,8 @@
 
   .gn-ui-btn-default {
     @apply gn-ui-btn text-white
-      bg-gray-700 hover:bg-gray-800 active:bg-gray-900
-      border-gray-700 focus:ring-4 focus:ring-gray-200;
+      bg-gray-700 hover:bg-gray-800 hover:!text-white active:bg-gray-900
+      border-gray-700 focus:ring-4 focus:ring-gray-200 focus:text-gray-900;
   }
 
   .gn-ui-btn-primary {
@@ -131,23 +131,11 @@
   .gn-ui-btn-light {
     @apply gn-ui-btn
       hover:bg-gray-50 focus:bg-gray-50 active:bg-gray-100
-      border-white focus:ring-4 focus:ring-gray-300;
-  }
-
-  .gn-ui-card-xs {
-    @apply min-h-[68px] md:w-[487px];
+      bg-white border-white focus:ring-4 focus:ring-gray-300;
   }
 
   .gn-ui-card-s {
-    @apply min-h-[135px] md:w-80;
-  }
-
-  .gn-ui-card-m {
-    @apply min-h-[68px] md:w-[487px];
-  }
-
-  .gn-ui-card-l {
-    @apply min-h-[68px] md:w-[992px];
+    @apply min-h-[64px] w-full xs:min-w-[260px] xs:max-w-[280px] sm:min-w-[300px] sm:max-w-[500px] md:min-w-[230px];
   }
 
   .gn-ui-card-title {
@@ -230,7 +218,7 @@
 
   /* Section title */
   .gn-ui-section-title {
-    @apply text-title font-medium pt-9 text-[28px] container-lg px-4 lg:mx-auto;
+    @apply text-title font-medium pt-9 text-[28px];
   }
 }