geonetwork-ui 2.6.0-dev.6681b0ab3 → 2.6.0-dev.6e0b3d33d

package/src/libs/ui/layout/src/lib/cell-popin/cell-popin.component.ts

@@ -0,0 +1,141 @@
+import {
+  AfterViewInit,
+  Component,
+  Input,
+  OnDestroy,
+  ElementRef,
+  TemplateRef,
+  ViewChild,
+  Injector,
+  ChangeDetectorRef,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { provideIcons, NgIconComponent } from '@ng-icons/core'
+import { iconoirReduce } from '@ng-icons/iconoir'
+import { MatButtonModule } from '@angular/material/button'
+import {
+  OverlayModule,
+  ConnectedPosition,
+  ScrollDispatcher,
+  CdkScrollable,
+  CdkConnectedOverlay,
+  OverlayContainer,
+} from '@angular/cdk/overlay'
+import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
+@Component({
+  selector: 'gn-ui-cell-popin',
+  standalone: true,
+  imports: [
+    CommonModule,
+    MatButtonModule,
+    OverlayModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [provideIcons({ iconoirReduce })],
+  templateUrl: './cell-popin.component.html',
+  styleUrls: [],
+})
+export class CellPopinComponent implements AfterViewInit, OnDestroy {
+  @Input() extraClass = ''
+  @Input() cdkScrollContainer!: CdkScrollable
+  @Input() scrollContainer!: ElementRef
+
+  @ViewChild('anchorRef') anchorRef!: ElementRef
+
+  protected isOpen = false
+  protected isVisible = true
+  protected overlayPositions: ConnectedPosition[] = [
+    {
+      originX: 'end',
+      originY: 'top',
+      overlayX: 'end',
+      overlayY: 'top',
+    },
+    {
+      originX: 'start',
+      originY: 'top',
+      overlayX: 'start',
+      overlayY: 'top',
+    },
+  ]
+
+  private firstCheck = true
+  private intersectionObserver: IntersectionObserver
+
+  private _activePopin = true
+
+  @Input()
+  set activePopin(active: boolean | undefined) {
+    this._activePopin = !!active
+    this.updateIntersectionObserver()
+  }
+  get activePopin(): boolean {
+    return this._activePopin
+  }
+
+  constructor(
+    private scrollDispatcher: ScrollDispatcher,
+    private cdr: ChangeDetectorRef
+  ) {}
+
+  ngAfterViewInit() {
+    if (!this.activePopin) {
+      return
+    }
+
+    if (this.cdkScrollContainer) {
+      this.scrollDispatcher.register(this.cdkScrollContainer)
+    }
+
+    this.updateIntersectionObserver()
+  }
+
+  ngOnDestroy() {
+    this.intersectionObserver?.disconnect()
+    this.scrollDispatcher.deregister(this.cdkScrollContainer)
+  }
+
+  updateIntersectionObserver() {
+    if (!this.scrollContainer || !this.anchorRef) {
+      return
+    }
+
+    if (this.intersectionObserver) {
+      this.intersectionObserver?.disconnect()
+    }
+
+    this.intersectionObserver = new IntersectionObserver(
+      ([entry]) => {
+        const visible = entry.intersectionRatio >= 1
+
+        // Ignore first visibility if first time opening it
+        if (this.firstCheck && !visible) {
+          this.firstCheck = false
+          return
+        }
+
+        this.firstCheck = false
+
+        if (this.isVisible !== visible) {
+          this.isVisible = visible
+          this.cdr.detectChanges()
+        }
+      },
+      {
+        root: this.scrollContainer.nativeElement,
+        threshold: 1.0,
+      }
+    )
+
+    this.intersectionObserver.observe(this.anchorRef.nativeElement)
+  }
+
+  openOverlay() {
+    this.isOpen = true
+  }
+
+  closeOverlay() {
+    this.isOpen = false
+  }
+}

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/layout/src/lib/truncated-text/truncated-text.component.html

@@ -1,44 +1,27 @@
-<div
-  class="flex items-center justify-between w-full gap-2"
-  cdkOverlayOrigin
-  [class]="extraClass"
-  #trigger="cdkOverlayOrigin"
+<gn-ui-cell-popin
+  #popinRef
+  [activePopin]="isTextTruncated"
+  [scrollContainer]="scrollContainer"
+  [cdkScrollContainer]="cdkScrollContainer"
 >
-  <span #textElement class="truncate">
-    {{ text }}
-  </span>
-  <gn-ui-button
-    *ngIf="isTextTruncated"
-    type="outline"
-    extraClass="w-10 h-8 border rounded-lg"
-    (buttonClick)="toggleOverlay()"
+  <div
+    cellContent
+    class="flex items-center justify-between w-full gap-2"
+    [class]="extraClass"
   >
-    <ng-icon name="iconoirExpand" size="24"> </ng-icon>
-  </gn-ui-button>
-
-  <ng-template
-    cdkConnectedOverlay
-    [cdkConnectedOverlayOrigin]="trigger"
-    [cdkConnectedOverlayOpen]="isOpen"
-    [cdkConnectedOverlayPositions]="[overlayPosition]"
-    cdkConnectedOverlayPush
-    [cdkConnectedOverlayWidth]="'auto'"
-    [cdkConnectedOverlayFlexibleDimensions]="true"
-    [cdkConnectedOverlayGrowAfterOpen]="true"
-    (detach)="close()"
-  >
-    <div class="bg-white shadow-lg border border-gray-300 flex">
-      <div class="sm:w-64 xs:w-32">
-        <p class="m-2">{{ text }}</p>
-      </div>
-      <gn-ui-button
-        class="m-2 flex-shrink-0"
-        type="light"
-        (buttonClick)="close()"
-        extraClass="w-10 h-8 px-1 bg-white"
-      >
-        <ng-icon name="iconoirReduce" size="24"> </ng-icon>
-      </gn-ui-button>
-    </div>
-  </ng-template>
-</div>
+    <span #textElement class="truncate py-3 px-2">
+      {{ text }}
+    </span>
+    <gn-ui-button
+      *ngIf="isTextTruncated"
+      type="outline"
+      extraClass="w-10 h-8 border rounded-lg mr-2"
+      (buttonClick)="popinRef.openOverlay()"
+    >
+      <ng-icon name="iconoirExpand" size="24"> </ng-icon>
+    </gn-ui-button>
+  </div>
+  <div popinContent class="sm:w-64 xs:w-32 py-4 pl-6 pr-9">
+    <p>{{ text }}</p>
+  </div>
+</gn-ui-cell-popin>

package/src/libs/ui/layout/src/lib/truncated-text/truncated-text.component.ts

@@ -10,16 +10,17 @@ import {
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { provideIcons, NgIconComponent } from '@ng-icons/core'
-import { iconoirExpand, iconoirReduce } from '@ng-icons/iconoir'
+import { iconoirExpand } from '@ng-icons/iconoir'
 import { TranslateModule } from '@ngx-translate/core'
 import { MatButtonModule } from '@angular/material/button'
 import {
+  CdkScrollable,
   OverlayModule,
   ViewportRuler,
   ConnectedPosition,
 } from '@angular/cdk/overlay'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
-import { Subscription } from 'rxjs'
+import { CellPopinComponent } from '../cell-popin/cell-popin.component'
 
 @Component({
   selector: 'gn-ui-truncated-text',
@@ -30,33 +31,29 @@ import { Subscription } from 'rxjs'
     MatButtonModule,
     OverlayModule,
     ButtonComponent,
+    CellPopinComponent,
     NgIconComponent,
   ],
-  providers: [provideIcons({ iconoirExpand, iconoirReduce })],
+  providers: [provideIcons({ iconoirExpand })],
   templateUrl: './truncated-text.component.html',
   styles: [],
 })
 export class TruncatedTextComponent implements AfterViewInit, OnDestroy {
   @Input() text = ''
   @Input() extraClass = ''
+  @Input() scrollContainer!: ElementRef
+  @Input() cdkScrollContainer!: CdkScrollable
 
   @ViewChild('textElement') textElement: ElementRef<HTMLElement>
+
   isTextTruncated = false
-  isOpen = false
-  overlayPosition: ConnectedPosition = {
-    originX: 'end',
-    originY: 'top',
-    overlayX: 'end',
-    overlayY: 'top',
-  }
+
   private readonly resizeObserver: ResizeObserver
   private readonly mutationObserver: MutationObserver
-  private readonly viewportSubscription: Subscription
 
   constructor(
     private readonly cd: ChangeDetectorRef,
-    private readonly ngZone: NgZone,
-    private readonly viewportRuler: ViewportRuler
+    private readonly ngZone: NgZone
   ) {
     this.resizeObserver = new ResizeObserver(() => {
       this.ngZone.run(() => this.checkTextTruncation())
@@ -65,15 +62,8 @@ export class TruncatedTextComponent implements AfterViewInit, OnDestroy {
     this.mutationObserver = new MutationObserver(() => {
       this.ngZone.run(() => {
         this.checkTextTruncation()
-        this.close()
       })
     })
-
-    this.viewportSubscription = this.viewportRuler.change().subscribe(() => {
-      if (this.isOpen) {
-        this.updateOverlayPosition()
-      }
-    })
   }
 
   ngAfterViewInit() {
@@ -90,35 +80,6 @@ export class TruncatedTextComponent implements AfterViewInit, OnDestroy {
   ngOnDestroy() {
     this.resizeObserver?.disconnect()
     this.mutationObserver?.disconnect()
-    this.viewportSubscription?.unsubscribe()
-    this.close()
-  }
-
-  toggleOverlay() {
-    this.isOpen = !this.isOpen
-    if (this.isOpen) {
-      this.updateOverlayPosition()
-    }
-  }
-
-  private updateOverlayPosition() {
-    const element = this.textElement.nativeElement
-    const rect = element.getBoundingClientRect()
-    const viewportWidth = this.viewportRuler.getViewportSize().width
-    const isMobile = viewportWidth < 640
-    const overlayWidth = isMobile ? 190 : 320
-    const isNearLeftEdge = rect.left < overlayWidth
-
-    this.overlayPosition = {
-      originX: isNearLeftEdge ? 'start' : 'end',
-      originY: 'top',
-      overlayX: isNearLeftEdge ? 'start' : 'end',
-      overlayY: 'top',
-    }
-  }
-
-  close() {
-    this.isOpen = false
   }
 
   private checkTextTruncation() {

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

@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { NgIconComponent } from '@ng-icons/core'
 import { StickyHeaderComponent } from './sticky-header/sticky-header.component'
 import { AnchorLinkDirective } from './anchor-link/anchor-link.directive'
-import { NgIconComponent, provideNgIconsConfig } from '@ng-icons/core'
 
 @NgModule({
   imports: [CommonModule, TranslateModule.forChild(), NgIconComponent],

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;
+}