geonetwork-ui 2.6.0-dev.3e7617888 → 2.6.0-dev.4a61a87f9

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

@@ -30,13 +30,15 @@ type ActionMenuPage = 'mainMenu' | 'deleteMenu' | 'rollbackMenu'
   ],
 })
 export class ActionMenuComponent {
-  @Input() canDuplicate: boolean
-  @Input() canDelete: boolean
-  @Input() isDraftPage: boolean
+  @Input() canDuplicate = true
+  @Input() isDuplicating: boolean
+  @Input() canDelete = true
+  @Input() page: 'draft' | 'main' | 'record'
   @Output() duplicate = new EventEmitter<void>()
   @Output() delete = new EventEmitter<void>()
   @Output() closeActionMenu = new EventEmitter<void>()
   @Output() rollback = new EventEmitter<void>()
+  @Output() switch = new EventEmitter<void>()
 
   @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger
 
@@ -47,20 +49,22 @@ export class ActionMenuComponent {
     private cdr: ChangeDetectorRef
   ) {}
 
-  openMenu() {
-    this.trigger.openMenu()
-  }
-
   displayMainMenu() {
     this.sectionDisplayed = 'mainMenu'
     this.cdr.markForCheck()
   }
 
   displayDeleteMenu() {
-    if (this.isDraftPage) {
-      this.sectionDisplayed = 'rollbackMenu'
-    } else {
-      this.sectionDisplayed = 'deleteMenu'
+    switch (this.page) {
+      case 'draft':
+        this.sectionDisplayed = 'rollbackMenu'
+        break
+      case 'record':
+        this.delete.emit()
+        break
+      case 'main':
+      default:
+        this.sectionDisplayed = 'deleteMenu'
     }
     this.cdr.markForCheck()
   }

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

@@ -0,0 +1,4 @@
+:host {
+  --gn-ui-button-height: 40px;
+  --gn-ui-button-width: 40px;
+}

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

@@ -1,5 +1,6 @@
 <gn-ui-interactive-table
   [items]="records"
+  [canEditItem]="canEdit"
   [isDraftPage]="isDraftPage"
   (itemClick)="handleRecordClick($event)"
 >
@@ -9,15 +10,16 @@
       <ng-icon
         name="iconoirLock"
         class="text-purple"
-        *ngIf="(!item.extras?.edit && !isDraftPage) || item.kind !== 'dataset'"
+        *ngIf="(canEdit(item) | async) === false; else selectCheckbox"
       ></ng-icon>
-      <gn-ui-checkbox
-        *ngIf="(item.extras?.edit || isDraftPage) && item.kind === 'dataset'"
-        [checked]="isChecked(item)"
-        (changed)="handleRecordSelectedChange($event, item)"
-        class="-m-2"
-        type="default"
-      ></gn-ui-checkbox>
+      <ng-template #selectCheckbox>
+        <gn-ui-checkbox
+          [checked]="isChecked(item)"
+          (changed)="handleRecordSelectedChange($event, item)"
+          class="-m-2"
+          type="default"
+        ></gn-ui-checkbox>
+      </ng-template>
     </ng-template>
   </gn-ui-interactive-table-column>
 
@@ -143,29 +145,31 @@
   <gn-ui-interactive-table-column>
     <ng-template #header> </ng-template>
     <ng-template #cell let-item>
-      <gn-ui-button
-        cdkOverlayOrigin
-        #actionMenuButton
-        (buttonClick)="openActionMenu(item, template)"
-        type="light"
-        data-test="record-menu-button"
-        [disabled]="
-          (!item.extras?.edit && !isDraftPage) || item.kind !== 'dataset'
-        "
-      >
+      <div class="flex justify-end items-center gap-4 w-full">
+        <!-- IS MULTILINGUAL -->
         <ng-icon
-          [ngClass]="{
-            'text-purple-light':
-              (!item.extras?.edit && !isDraftPage) || item.kind !== 'dataset',
-          }"
-          name="matMoreVert"
+          *ngIf="isMultilingual(item)"
+          data-cy="multilingual-indicator"
+          name="iconoirTranslate"
+          [attr.title]="getTxtHoverMultilingual(item)"
         ></ng-icon>
-      </gn-ui-button>
+        <!-- MORE ACTIONS MENU BUTTON -->
+        <gn-ui-button
+          cdkOverlayOrigin
+          #actionMenuButton
+          (buttonClick)="openActionMenu(item, template)"
+          type="light"
+          data-test="record-menu-button"
+        >
+          <ng-icon name="matMoreVert"></ng-icon>
+        </gn-ui-button>
+      </div>
       <ng-template #template>
         <gn-ui-action-menu
-          [canDuplicate]="canDuplicate(item) && !isDuplicating"
-          [canDelete]="canDelete(item)"
-          [isDraftPage]="isDraftPage"
+          [canDuplicate]="canDuplicate(item)"
+          [isDuplicating]="isDuplicating"
+          [canDelete]="canDelete(item) | async"
+          [page]="isDraftPage ? 'draft' : 'main'"
           (duplicate)="handleDuplicate(item)"
           (delete)="handleDelete(item)"
           (closeActionMenu)="closeActionMenu()"

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,10 +175,14 @@ export class ResultsTableComponent {
     return getBadgeColor(format)
   }
 
-  handleRecordClick(item: CatalogRecord) {
-    if ((item?.extras?.edit || this.isDraftPage) && item.kind === 'dataset') {
-      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) {
@@ -219,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

@@ -39,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: [
@@ -79,6 +80,7 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     }),
     KindBadgeComponent,
     MetadataQualityComponent,
+    ActionMenuComponent,
   ],
   exports: [
     RecordPreviewListComponent,
@@ -93,6 +95,7 @@ import { matFace } from '@ng-icons/material-icons/baseline'
     ResultsHitsSearchKindComponent,
     RecordPreviewFeedComponent,
     RecordPreviewRowComponent,
+    ActionMenuComponent,
   ],
   providers: [
     provideNgIconsConfig({

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/lib/links/link-classifier.service.ts

@@ -31,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':

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

@@ -247,6 +247,9 @@ export function getLinkLabel(
           case 'wmts':
             format = 'WMTS'
             break
+          case 'tms':
+            format = 'TMS'
+            break
           case 'esriRest':
             format = 'REST'
             break

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

@@ -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 {

package/translations/de.json

@@ -30,6 +30,7 @@
   "dashboard.labels.mySpace": "Mein Bereich",
   "dashboard.records.all": "Metadatenkatalog",
   "dashboard.records.hasDraft": "",
+  "dashboard.records.isMultilingual": "Dieser Eintrag ist mehrsprachig ({languages})",
   "dashboard.records.myDraft": "Meine Entwürfe",
   "dashboard.records.myRecords": "Meine Datensätze",
   "dashboard.records.search": "Suche nach \"{searchText}\"",
@@ -204,6 +205,13 @@
   "editor.record.form.license.odc-by": "",
   "editor.record.form.license.pddl": "",
   "editor.record.form.license.unknown": "",
+  "editor.record.form.multilingual.activate": "",
+  "editor.record.form.multilingual.default": "",
+  "editor.record.form.multilingual.enable": "",
+  "editor.record.form.multilingual.forbidden": "",
+  "editor.record.form.multilingual.open": "",
+  "editor.record.form.multilingual.title": "",
+  "editor.record.form.multilingual.validate": "",
   "editor.record.form.page.accessAndContact": "",
   "editor.record.form.page.description": "",
   "editor.record.form.page.resources": "",
@@ -233,8 +241,13 @@
   "editor.record.loadError.body": "Der Datensatz konnte nicht geladen werden:",
   "editor.record.loadError.closeMessage": "Verstanden",
   "editor.record.loadError.title": "Fehler beim Laden des Datensatzes",
-  "editor.record.lock.format": "",
-  "editor.record.lock.reason": "",
+  "editor.record.lock.harvested": "",
+  "editor.record.lock.owner": "",
+  "editor.record.lock.resourceType": "",
+  "editor.record.multilingual.confirmation.cancelText": "",
+  "editor.record.multilingual.confirmation.confirmText": "",
+  "editor.record.multilingual.confirmation.message": "",
+  "editor.record.multilingual.confirmation.title": "",
   "editor.record.onlineResource.protocol.other": "",
   "editor.record.onlineResourceError.body": "",
   "editor.record.onlineResourceError.closeMessage": "",
@@ -295,20 +308,32 @@
   "input.image.uploadErrorLabel": "",
   "input.image.uploadProgressCancel": "",
   "input.image.uploadProgressLabel": "",
+  "language.ar": "",
+  "language.az": "",
   "language.ca": "Katalanisch",
   "language.cs": "Tschechisch",
+  "language.cy": "",
+  "language.da": "",
   "language.de": "Deutsch",
   "language.en": "Englisch",
   "language.es": "Spanisch",
   "language.fi": "Finnisch",
   "language.fr": "Französisch",
+  "language.hy": "",
   "language.is": "Isländisch",
   "language.it": "Italienisch",
+  "language.ka": "",
   "language.ko": "Koreanisch",
   "language.nl": "Niederländisch",
+  "language.no": "",
+  "language.pl": "",
   "language.pt": "Portugiesisch",
+  "language.rm": "",
   "language.ru": "Russisch",
   "language.sk": "Slowakisch",
+  "language.sv": "",
+  "language.tr": "",
+  "language.uk": "",
   "language.zh": "Chinesisch",
   "map.add.layer": "Eine Ebene hinzufügen",
   "map.add.layer.catalog": "Aus dem Katalog",
@@ -355,11 +380,13 @@
   "record.action.duplicate": "",
   "record.action.duplicating": "",
   "record.action.rollback": "",
+  "record.action.switchLang": "",
   "record.action.view": "Anzeigen",
   "record.card.metadata.contact": "",
   "record.externalViewer.open": "In externem Kartenviewer öffnen",
+  "record.feature.catalog.number.total.attribute": "",
+  "record.feature.catalog.number.total.object": "",
   "record.feature.limit": "Die Vorschau wurde aufgrund zu vieler Elemente deaktiviert",
-  "record.kind.data": "",
   "record.kind.dataset": "",
   "record.kind.reuse": "",
   "record.kind.service": "",
@@ -402,10 +429,17 @@
   "record.metadata.creation": "Erstellungsdatum",
   "record.metadata.details": "Über die Daten",
   "record.metadata.download": "Downloads",
+  "record.metadata.feature.catalog": "",
   "record.metadata.formats": "Formate",
+  "record.metadata.isGeographical": "Geographischer Datensatz",
   "record.metadata.keywords": "Stichworte",
   "record.metadata.languages": "Sprachen",
   "record.metadata.lastUpdate": "Zuletzt aktualisiert am {date}",
+  "record.metadata.linked.datasets": "Verknüpfte Datensätze",
+  "record.metadata.linked.records": "Verknüpfte Inhalte",
+  "record.metadata.linked.reuses": "Verknüpfte Wiederverwendungen",
+  "record.metadata.linked.services": "Verknüpfte Dienste",
+  "record.metadata.linked.sourceDatasets": "Quelldatensätze",
   "record.metadata.links": "Links",
   "record.metadata.noUsage": "Für diesen Datensatz sind keine Nutzungsbedingungen angegeben.",
   "record.metadata.otherConstraints": "Zusätzliche Bedingungen",
@@ -432,8 +466,7 @@
   "record.metadata.quality.topic.success": "Thema angegeben",
   "record.metadata.quality.updateFrequency.failed": "Aktualisierungsfrequenz nicht angegeben",
   "record.metadata.quality.updateFrequency.success": "Aktualisierungsfrequenz angegeben",
-  "record.metadata.related": "Ähnliche Datensätze",
-  "record.metadata.related.contents": "",
+  "record.metadata.related": "Entdecken Sie den Katalog",
   "record.metadata.ressources.and.links": "Ressourcen und Links",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "Status",
@@ -445,7 +478,6 @@
   "record.metadata.temporalExtent.untilDate": "Bis {end}",
   "record.metadata.title": "Titel",
   "record.metadata.topics": "Kategorien",
-  "record.metadata.type": "Geographischer Datensatz",
   "record.metadata.uniqueId": "Eindeutige Kennung",
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
   "record.metadata.updatedOn": "Geändert am",
@@ -467,10 +499,6 @@
   "results.layout.selectOne": "Layout auswählen",
   "results.records.hits.displayedOn": "{displayed, plural, =0{Kein Datensatz.} one{1 Datensatz} other{{displayed} Datensätze }} {hits, plural, other{angezeigt von {hits} insgesamt.}}",
   "results.records.hits.empty.help.html": "Vorschläge: <ul class='list-disc list-inside'><li>Versuchen Sie es mit anderen Worten</li><li>Beschränken Sie die Suchwörter</li></ul>",
-  "search.filters.recordKind.all": "Alle",
-  "search.filters.recordKind.dataset": "Datensätze",
-  "search.filters.recordKind.reuse": "Wiederverwendungen",
-  "search.filters.recordKind.service": "Dienste",
   "results.records.hits.found": "{hits, plural, =0{Keine Dokumente entsprechen der angegebenen Suche.} one{1 Datensatz gefunden.} other{{hits} Datensätze gefunden.}}",
   "results.records.hits.selected": "{ amount } ausgewählt",
   "results.showMore": "Mehr Ergebnisse anzeigen...",
@@ -489,6 +517,7 @@
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
   "search.field.any.placeholder": "Suche im katalog ...",
   "search.field.sortBy": "Sortieren nach:",
+  "search.filter.into.feature.catalog": "",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Letzte Aktualisierung",
@@ -519,6 +548,10 @@
   "search.filters.producerOrg": "",
   "search.filters.publicationYear": "Veröffentlichungsjahr",
   "search.filters.publisherOrg": "",
+  "search.filters.recordKind.all": "Alle",
+  "search.filters.recordKind.dataset": "Datensätze",
+  "search.filters.recordKind.reuse": "Wiederverwendungen",
+  "search.filters.recordKind.service": "Dienste",
   "search.filters.representationType": "Repräsentationstyp",
   "search.filters.resourceType": "Ressourcentyp",
   "search.filters.standard": "Standard",
@@ -548,6 +581,7 @@
   "service.metadata.other": "",
   "service.metadata.question": "",
   "service.metadata.search": "",
+  "service.metadata.search.clear": "",
   "service.metadata.spatialExtent": "",
   "share.tab.permalink": "Teilen",
   "share.tab.webComponent": "Integrieren",
@@ -563,7 +597,6 @@
   "tooltip.html.copy": "HTML kopieren",
   "tooltip.id.copy": "Eindeutige Kennung kopieren",
   "tooltip.url.copy": "URL kopieren",
-  "tooltip.url.open": "URL öffnen",
   "ui.readLess": "Weniger lesen",
   "ui.readMore": "Weiterlesen",
   "wfs.feature.limit": "Zu viele Features, um den WFS-Layer anzuzeigen!",