geonetwork-ui 2.6.0-dev.492bf4497 → 2.6.0-dev.4a61a87f9

package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.html

@@ -1,30 +1,9 @@
-<a
-  [class]="classList"
-  [routerLink]="['/dataset', record.uniqueIdentifier]"
-  target="_blank"
+<gn-ui-internal-link-card
+  [linkHref]="linkHref"
+  [linkTarget]="'_blank'"
+  [record]="record"
+  [favoriteTemplate]="favoriteTemplate"
+  [metadataQualityDisplay]="metadataQualityDisplay"
+  [size]="size"
 >
-  <div class="h-52 bg-gray-100">
-    <gn-ui-thumbnail
-      class="h-52 w-full object-cover"
-      [thumbnailUrl]="record.overviews?.[0]?.url.toString()"
-    ></gn-ui-thumbnail>
-  </div>
-  <div class="flex flex-col justify-between h-44 px-5 pt-4 pb-6">
-    <h4
-      class="max-h-24 font-title text-21 text-black text-ellipsis overflow-hidden"
-    >
-      {{ record.title }}
-    </h4>
-    <div>
-      <button
-        [matTooltip]="'tooltip.url.open' | translate"
-        matTooltipPosition="above"
-      >
-        <ng-icon
-          class="align-middle text-secondary"
-          name="matOpenInNew"
-        ></ng-icon>
-      </button>
-    </div>
-  </div>
-</a>
+</gn-ui-internal-link-card>

package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.ts

@@ -1,11 +1,19 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
+import { InternalLinkCardComponent } from '../internal-link-card/internal-link-card.component'
 import { RouterLink } from '@angular/router'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { TranslateModule } from '@ngx-translate/core'
 import { matOpenInNew } from '@ng-icons/material-icons/baseline'
+import { TemplateRef } from '@angular/core'
 
 @Component({
   selector: 'gn-ui-related-record-card',
@@ -13,6 +21,7 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
   styleUrls: ['./related-record-card.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
+    InternalLinkCardComponent,
     ThumbnailComponent,
     RouterLink,
     MatTooltipModule,
@@ -25,8 +34,12 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 export class RelatedRecordCardComponent {
   private readonly baseClasses: string
 
+  @Input() linkHref: string = null
   @Input() record: CatalogRecord
   @Input() extraClass = ''
+  @Input() favoriteTemplate: TemplateRef<{ $implicit: CatalogRecord }>
+  @Input() metadataQualityDisplay: boolean
+  @Input() size: string
 
   constructor() {
     this.baseClasses = [

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

@@ -16,17 +16,31 @@
             <div class="h-14 md:w-2/5 w-full mb-4 flex flex-row relative">
               <gn-ui-text-input
                 class="w-full"
+                [(value)]="searchQuery"
                 [extraClass]="getExtraInputClass()"
                 [placeholder]="'service.metadata.search' | translate"
                 (input)="onSearchChange($event)"
                 (keydown.enter)="onSearchEnter($event)"
               >
               </gn-ui-text-input>
+              <div
+                class="absolute right-14 h-14 w-14 flex items-center justify-center"
+              >
+                <button
+                  #inputBtn
+                  *ngIf="searchQuery"
+                  [aria-label]="'service.metadata.search.clear' | translate"
+                  (click)="clearSearch()"
+                  class="h-12 w-12 border-0 flex items-center justify-center"
+                >
+                  <ng-icon name="matClose"></ng-icon>
+                </button>
+              </div>
               <div class="border-l absolute border-gray-200 right-0 h-14 w-14">
                 <gn-ui-button
                   #inputBtn
                   type="outline"
-                  extraClass="h-12 w-12 border-0 absolute right-1 top-1"
+                  extraClass="h-12 w-12 border-0 absolute right-1 top-1 bg-white"
                   (buttonClick)="searchLayers()"
                 >
                   <ng-icon name="iconoirSearch"></ng-icon>

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

@@ -16,6 +16,7 @@ import {
   WmsLayerFull,
   WmtsLayer,
 } from '@camptocamp/ogc-client'
+import { matClose } from '@ng-icons/material-icons/baseline'
 
 marker(`service.metadata.search`)
 marker(`service.metadata.capabilities.title`)
@@ -48,6 +49,7 @@ marker(`service.metadata.capabilities.attribution`)
     provideIcons({
       iconoirSearch,
       matInfoOutline,
+      matClose,
     }),
   ],
   templateUrl: './service-capabilities.component.html',
@@ -104,6 +106,12 @@ export class ServiceCapabilitiesComponent implements OnInit {
     }
   }
 
+  clearSearch() {
+    this.searchActive = false
+    this.searchQuery = ''
+    this.filteredLayers = this.availableLayers
+  }
+
   async loadLayers() {
     if (
       this.apiLinks.length > 0 &&
@@ -176,7 +184,7 @@ export class ServiceCapabilitiesComponent implements OnInit {
   }
 
   getExtraClass(layerItem) {
-    return layerItem.title === this.selectedLayer?.title
+    return layerItem === this.selectedLayer
       ? `h-8 rounded-lg bg-primary-darker text-white hover:text-primary-darker hover:bg-white`
       : `h-8 rounded-lg`
   }

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

@@ -15,6 +15,7 @@ import { provideNgIconsConfig } from '@ng-icons/core'
 import { TranslateModule } from '@ngx-translate/core'
 import { AvatarComponent } from './avatar/avatar.component'
 import { ImageInputComponent } from './image-input/image-input.component'
+import { GeoDataBadgeComponent } from './geo-data-badge/geo-data-badge.component'
 import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
 import { KindBadgeComponent } from './kind-badge/kind-badge.component'
 import { ThumbnailComponent } from './thumbnail/thumbnail.component'
@@ -47,6 +48,7 @@ import { ServiceCapabilitiesComponent } from './service-capabilities/service-cap
     InternalLinkCardComponent,
     ServiceCapabilitiesComponent,
     KindBadgeComponent,
+    GeoDataBadgeComponent,
   ],
   providers: [
     provideNgIconsConfig({
@@ -64,6 +66,7 @@ import { ServiceCapabilitiesComponent } from './service-capabilities/service-cap
     InternalLinkCardComponent,
     ServiceCapabilitiesComponent,
     KindBadgeComponent,
+    GeoDataBadgeComponent,
   ],
 })
 export class UiElementsModule {}

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.html

@@ -79,7 +79,7 @@
   <mat-option
     *ngFor="let suggestion of suggestions$ | async"
     [value]="suggestion"
-    class="p-2 suggestion"
+    class="p-2 suggestion text-start"
   >
     {{ displayWithFnInternal(suggestion) }}
   </mat-option>

package/src/libs/ui/inputs/src/lib/star-toggle/star-toggle.component.html

@@ -1,8 +1,7 @@
-<div class="inline-block relative align-middle" style="line-height: 0.7em">
+<div class="inline-block relative align-middle">
   <gn-ui-button
     [type]="'outline'"
     [disabled]="disabled"
-    class="-m-[8px] p-[8px]"
     (buttonClick)="toggle($event)"
     [ngClass]="{
       enabled: toggled,

package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.html

@@ -31,6 +31,7 @@
     *ngFor="let item of items"
     (click)="handleRowClick(item)"
     data-cy="table-row"
+    [attr.data-cy-title]="item.title"
     [title]="getItemTitle(item) | translate"
   >
     <div
@@ -48,9 +49,9 @@
         class="table-row-cell px-3 py-1.5 flex items-center bg-white transition-colors duration-75 truncate border-b border-gray-200"
         [ngClass]="{
           'text-purple-light cursor-default':
-            (!item.extras?.edit && !isDraftPage) || item.kind !== 'dataset',
+            (canEditItem(item) | async) === false,
           'group-hover:text-main group-hover:bg-gray-50':
-            (item.extras?.edit || isDraftPage) && item.kind === 'dataset',
+            canEditItem(item) | async,
         }"
       >
         <ng-container

package/src/libs/ui/layout/src/lib/interactive-table/interactive-table.component.ts

@@ -14,9 +14,11 @@ import { iconoirNavArrowDown, iconoirNavArrowUp } from '@ng-icons/iconoir'
 import { TranslateModule } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { Observable, of } from 'rxjs'
 
-marker('editor.record.lock.reason')
-marker('editor.record.lock.format')
+marker('editor.record.lock.resourceType')
+marker('editor.record.lock.harvested')
+marker('editor.record.lock.owner')
 @Component({
   selector: 'gn-ui-interactive-table',
   templateUrl: './interactive-table.component.html',
@@ -31,6 +33,7 @@ export class InteractiveTableComponent {
   columns: QueryList<InteractiveTableColumnComponent>
 
   @Input() items: unknown[] = []
+  @Input() canEditItem: (item: unknown) => Observable<boolean> = () => of(true)
   @Input() isDraftPage = false
   @Output() itemClick = new EventEmitter<unknown>()
 
@@ -49,10 +52,14 @@ export class InteractiveTableComponent {
   }
 
   getItemTitle(item: CatalogRecord) {
-    if (!item.extras?.edit && !this.isDraftPage && item.kind === 'dataset') {
-      return 'editor.record.lock.reason'
-    } else if (item.kind !== 'dataset') {
-      return 'editor.record.lock.format'
+    if (!this.isDraftPage) {
+      if (item.kind !== 'dataset') {
+        return 'editor.record.lock.resourceType'
+      } else if (item.extras?.isHarvested) {
+        return 'editor.record.lock.harvested'
+      } else if (!item.extras?.edit) {
+        return 'editor.record.lock.owner'
+      }
     }
     return ''
   }

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

@@ -19,3 +19,4 @@ export * from './lib/results-list-item/results-list-item.component'
 export * from './lib/results-hits-search-kind/results-hits-search-kind.component'
 export * from './lib/results-hits-number/results-hits-number.component'
 export * from './lib/results-table/results-table.component'
+export * from './lib/results-table/action-menu/action-menu.component'

package/src/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.html

@@ -1,82 +1,10 @@
-<a
-  class="group container-lg mx-auto flex cursor-pointer flex-wrap sm:flex-nowrap"
-  [title]="record.title"
-  [attr.href]="linkHref"
+<gn-ui-internal-link-card
+  [linkHref]="linkHref"
+  [linkTarget]="linkTarget"
+  [record]="record"
+  [favoriteTemplate]="favoriteTemplate"
+  [metadataQualityDisplay]="metadataQualityDisplay"
+  (mdSelect)="mdSelect.emit($event)"
+  size="L"
 >
-  <div class="shrink-0 w-full sm:w-52">
-    <div
-      class="overflow-hidden bg-gray-100 rounded-lg w-full border border-gray-300 h-36"
-    >
-      <gn-ui-thumbnail
-        class="relative h-full w-full object-cover object-left-top"
-        [thumbnailUrl]="[
-          record.overviews?.[0]?.url?.toString(),
-          organization?.logoUrl?.toString(),
-        ]"
-        [fit]="['cover', 'contain']"
-      ></gn-ui-thumbnail>
-    </div>
-  </div>
-  <div
-    class="content grid grow relative sm:pl-6 sm:pr-12"
-    style="grid-template-columns: auto 70px"
-  >
-    <div class="mb-3 mt-5 sm:mt-2">
-      <div
-        class="font-title text-21 text-title line-clamp-2 col-start-1 col-span-2 sm:line-clamp-1 group-hover:text-primary transition-colors"
-        data-cy="recordTitle"
-      >
-        {{ record.title }}
-      </div>
-    </div>
-    <div
-      class="abstract mt-4 mb-5 h-36 line-clamp-6 col-start-1 col-span-2 row-start-3 sm:mb-2 sm:h-[4.5rem] sm:line-clamp-3 sm:row-start-2 sm:mt-0"
-      data-cy="recordAbstract"
-    >
-      <gn-ui-markdown-parser
-        [textContent]="abstract"
-        whitoutStyles="true"
-      ></gn-ui-markdown-parser>
-    </div>
-    <div
-      class="text-primary opacity-45 uppercase col-start-1 col-span-2 row-start-2 sm:truncate sm:row-start-3 sm:col-span-1"
-      data-cy="recordOrg"
-      [class]="metadataQualityDisplay ? 'limit-organisation-with-quality' : ''"
-    >
-      {{ organization?.name }}
-    </div>
-    <div
-      class="icons flex flex-row col-start-1 row-start-4 sm:col-start-2 sm:row-start-3 sm:absolute sm:right-[0.4em]"
-    >
-      <ng-icon
-        *ngIf="isDownloadable"
-        class="text-primary opacity-45 mx-1"
-        name="matCloudDownloadOutline"
-      ></ng-icon>
-      <ng-icon
-        *ngIf="isViewable"
-        class="text-primary opacity-45 mx-1"
-        name="matMapOutline"
-      ></ng-icon>
-    </div>
-    <div
-      *ngIf="metadataQualityDisplay"
-      class="col-start-2 row-start-4 sm:row-start-3 absolute right-[4em] sm:right-[5em]"
-    >
-      <gn-ui-metadata-quality
-        [smaller]="true"
-        [metadata]="record"
-        [metadataQualityDisplay]="metadataQualityDisplay"
-      ></gn-ui-metadata-quality>
-    </div>
-    <div
-      class="text-right col-start-3 row-start-4 sm:absolute sm:col-start-2 sm:row-start-1 sm:top-[-1.125em] sm:right-[0.4em]"
-      data-cy="recordFav"
-    >
-      <ng-container
-        [ngTemplateOutlet]="favoriteTemplate"
-        [ngTemplateOutletContext]="{ $implicit: record }"
-      ></ng-container>
-    </div>
-  </div>
-</a>
+</gn-ui-internal-link-card>

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

@@ -5,6 +5,7 @@
 >
   <ng-template let-choice>
     <gn-ui-kind-badge
+      [styling]="'custom'"
       [kind]="choice.value"
       [contentTemplate]="customTemplate"
       class="gn-ui-btn-outline rounded-md py-2 px-2 border-gray-400 cursor-pointer focus-within:text-primary-darkest focus-within:bg-gray-50 transition-colors bg-transparent hover:text-primary-darker focus:text-primary-darker active:text-primary-black"

package/src/libs/ui/search/src/lib/results-list/results-layout.config.ts

@@ -32,9 +32,9 @@ export const DEFAULT_RESULTS_LAYOUT_CONFIG: ResultsLayoutConfigModel = {
   ),
   ROW: new ResultsLayoutConfigItem(
     RecordPreviewRowComponent,
-    'pt-4 pb-5 sm:py-7',
+    'py-2',
     '',
-    'grid grid-cols-1 divide-y divide-gray-300'
+    'grid grid-cols-1 divide-y divide-gray-100'
   ),
   FEED: new ResultsLayoutConfigItem(
     RecordPreviewFeedComponent,

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

@@ -6,13 +6,13 @@
       *ngFor="let record of records"
     >
       <gn-ui-results-list-item
+        [attr.data-cy]="record.uniqueIdentifier"
         [record]="record"
         [layoutConfig]="layoutConfig"
         [metadataQualityDisplay]="metadataQualityDisplay"
         (mdSelect)="mdSelect.emit($event)"
         [favoriteTemplate]="favoriteTemplate"
         [linkHref]="recordUrlGetter(record)"
-        [attr.data-cy]="record.uniqueIdentifier"
       ></gn-ui-results-list-item>
     </div>
   </div>

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

@@ -3,7 +3,6 @@ import {
   Component,
   EventEmitter,
   Input,
-  OnInit,
   Output,
   TemplateRef,
 } from '@angular/core'

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

@@ -6,17 +6,27 @@
     >
       <ul class="flex flex-col gap-2 w-full">
         <gn-ui-button
-          *ngIf="!isDraftPage"
+          *ngIf="page === 'main'"
           type="light"
           extraClass="flex flex-row items-center gap-2 w-full justify-start"
           (buttonClick)="duplicate.emit()"
           [disabled]="!canDuplicate"
           data-test="record-menu-duplicate-button"
         >
-          <span *ngIf="canDuplicate" translate>record.action.duplicate</span>
-          <span *ngIf="!canDuplicate" translate
+          <span *ngIf="isDuplicating; else notDuplicating" translate
             >record.action.duplicating</span
-          ></gn-ui-button
+          >
+          <ng-template #notDuplicating>
+            <span translate>record.action.duplicate</span>
+          </ng-template>
+        </gn-ui-button>
+        <gn-ui-button
+          *ngIf="page === 'record'"
+          type="light"
+          extraClass="flex flex-row items-center gap-2 w-full justify-start"
+          (buttonClick)="switch.emit()"
+          data-test="record-menu-switch-button"
+          ><span translate>record.action.switchLang</span></gn-ui-button
         >
         <gn-ui-button
           type="light"
@@ -24,8 +34,8 @@
           (buttonClick)="displayDeleteMenu()"
           [disabled]="!canDelete"
           data-test="record-menu-delete-button"
-          ><span *ngIf="!isDraftPage" translate>record.action.delete</span>
-          <span *ngIf="isDraftPage" translate
+          ><span *ngIf="page !== 'draft'" translate>record.action.delete</span>
+          <span *ngIf="page === 'draft'" translate
             >record.action.rollback</span
           ></gn-ui-button
         >

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()"