geonetwork-ui 2.6.0-dev.f073bbb4e → 2.6.1-dev.e79bf07fb

package/src/libs/ui/layout/src/lib/block-list/block-list.component.ts

@@ -5,7 +5,10 @@ import {
   Component,
   ContentChildren,
   ElementRef,
+  EventEmitter,
+  HostListener,
   Input,
+  Output,
   QueryList,
   ViewChild,
 } from '@angular/core'
@@ -13,6 +16,7 @@ import { CommonModule } from '@angular/common'
 import { Paginable } from '../paginable.interface'
 import { PaginationDotsComponent } from '../pagination-dots/pagination-dots.component'
 
+type ComponentSize = 'L' | 'M' | 'S' | 'XS'
 @Component({
   selector: 'gn-ui-block-list',
   templateUrl: './block-list.component.html',
@@ -22,15 +26,15 @@ import { PaginationDotsComponent } from '../pagination-dots/pagination-dots.comp
   imports: [CommonModule, PaginationDotsComponent],
 })
 export class BlockListComponent implements AfterViewInit, Paginable {
-  @Input() pageSize = 5
+  pageSize = 4
   @Input() containerClass = ''
   @Input() paginationContainerClass = 'w-full bottom-0 top-auto'
   @ContentChildren('block', { read: ElementRef }) blocks: QueryList<
     ElementRef<HTMLElement>
   >
   @ViewChild('blockContainer') blockContainer: ElementRef<HTMLElement>
-
-  protected minHeight = 0
+  @Output() listChanges = new EventEmitter<BlockListComponent>()
+  subComponentSize: ComponentSize = 'M'
 
   protected currentPage_ = 0
   protected get pages() {
@@ -47,18 +51,29 @@ export class BlockListComponent implements AfterViewInit, Paginable {
     return this.blocks ? Math.ceil(this.blocks.length / this.pageSize) : 1
   }
   get currentPage() {
-    return this.currentPage_ + 1 // this is 1-based
+    return this.currentPage_ + 1
   }
 
   constructor(private changeDetector: ChangeDetectorRef) {}
 
-  ngAfterViewInit() {
-    this.blocks.changes.subscribe(this.refreshBlocksVisibility)
+  @HostListener('window:resize')
+  onResize() {
+    this.updateSizes()
     this.refreshBlocksVisibility()
+  }
 
-    // we store the first height as the min-height of the list container
-    this.minHeight = this.blockContainer.nativeElement.clientHeight
+  ngAfterViewInit() {
+    this.blocks.changes.subscribe(() => {
+      this.updateSizes()
+      this.refreshBlocksVisibility()
+      this.goToPage(1)
+      this.changeDetector.detectChanges()
+      this.listChanges.emit(this)
+    })
+    this.updateSizes()
+    this.refreshBlocksVisibility()
     this.changeDetector.detectChanges()
+    this.listChanges.emit(this)
   }
 
   protected refreshBlocksVisibility = () => {
@@ -71,7 +86,40 @@ export class BlockListComponent implements AfterViewInit, Paginable {
     })
   }
 
-  // pageIndex is 1-based
+  protected updateSizes() {
+    this.subComponentSize = this.computeResponsiveSize()
+    this.pageSize = this.computePageSize()
+  }
+
+  protected computeResponsiveSize(): ComponentSize {
+    if (window.innerWidth < 768) {
+      return 'XS'
+    }
+    return this.computeSubComponentSize()
+  }
+
+  protected computeSubComponentSize(): ComponentSize {
+    if (!this.blocks) return 'M'
+    const subComponentsCount = this.blocks.length
+    if (subComponentsCount <= 3) return 'L'
+    if (subComponentsCount <= 12) return 'M'
+    if (subComponentsCount <= 18) return 'S'
+    return 'XS'
+  }
+
+  protected computePageSize(): number {
+    switch (this.subComponentSize) {
+      case 'L':
+        return 3
+      case 'S':
+        return 6
+      case 'XS':
+        return 8
+      default:
+        return 4
+    }
+  }
+
   public goToPage(pageIndex: number) {
     this.currentPage_ = Math.max(
       Math.min(pageIndex - 1, this.pagesCount - 1),

package/src/libs/ui/layout/src/lib/carousel/carousel.component.css

@@ -1,4 +1,3 @@
 :host {
   position: relative;
-  display: block;
 }

package/src/libs/ui/layout/src/lib/carousel/carousel.component.html

@@ -1,4 +1,4 @@
-<div #carouselOverflowContainer class="w-full">
+<div #carouselOverflowContainer class="w-full block">
   <div class="carousel-container flex" [ngClass]="containerClass">
     <ng-content></ng-content>
   </div>

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

@@ -0,0 +1,40 @@
+<div
+  class="h-full flex items-center justify-center"
+  cdkOverlayOrigin
+  #anchorRef
+  #trigger="cdkOverlayOrigin"
+  [class]="extraClass"
+  data-cy="cell-popin"
+>
+  <ng-content select="[cellContent]"></ng-content>
+  <ng-template
+    *ngIf="activePopin"
+    cdkConnectedOverlay
+    [cdkConnectedOverlayPush]="false"
+    [cdkConnectedOverlayOrigin]="trigger"
+    [cdkConnectedOverlayOpen]="isOpen"
+    [cdkConnectedOverlayPositions]="overlayPositions"
+    [cdkConnectedOverlayWidth]="'auto'"
+    [cdkConnectedOverlayFlexibleDimensions]="true"
+    [cdkConnectedOverlayGrowAfterOpen]="true"
+    (detach)="closeOverlay()"
+  >
+    <div
+      *ngIf="activePopin && isVisible"
+      class="bg-white shadow-lg border border-gray-300 relative"
+      data-cy="cell-popin-content"
+    >
+      <ng-content select="[popinContent]"></ng-content>
+      <gn-ui-button
+        data-cy="cell-popin-close"
+        [style.--gn-ui-button-background]="'bg-transparent'"
+        class="absolute top-2 right-2"
+        type="light"
+        (buttonClick)="closeOverlay()"
+        extraClass="w-10 h-8 px-1"
+      >
+        <ng-icon name="iconoirReduce" size="24"></ng-icon>
+      </gn-ui-button>
+    </div>
+  </ng-template>
+</div>

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/expandable-panel/expandable-panel.component.html

@@ -1,22 +1,38 @@
 <div
-  class="group flex align-middle title border-b border-gray-100 cursor-pointer pt-2.5"
+  class="group flex items-center justify-between title border-b border-gray-100 cursor-pointer"
   (click)="toggle()"
+  data-cy="expandable-panel-header"
 >
-  <div class="grow font-medium text-black text-sm">
-    {{ title }}
+  <div class="grow py-2.5">
+    <ng-container *ngIf="titleTemplate; else simpleTitle">
+      <div data-cy="expandable-panel-custom-title">
+        <ng-container *ngTemplateOutlet="titleTemplate"></ng-container>
+      </div>
+    </ng-container>
+    <ng-template #simpleTitle>
+      <div
+        class="font-medium text-black text-sm"
+        data-cy="expandable-panel-title"
+      >
+        {{ title }}
+      </div>
+    </ng-template>
   </div>
   <div
-    class="w-8 opacity-25 text-primary group-hover:opacity-100 transition-opacity"
+    class="w-8 opacity-25 text-primary group-hover:opacity-100 transition-opacity flex items-center shrink-0"
   >
-    <ng-icon name="matAdd" *ngIf="collapsed"></ng-icon>
-    <ng-icon name="matRemove" *ngIf="!collapsed"></ng-icon>
+    <ng-icon
+      [name]="collapsed ? 'matAdd' : 'matRemove'"
+      [style.color]="iconColor"
+    ></ng-icon>
   </div>
 </div>
 <div
-  class="content overflow-hidden transition-[max-height] duration-300"
+  class="content overflow-hidden transition-all duration-300"
   [ngClass]="collapsed ? 'ease-out' : 'ease-in'"
-  [style.maxHeight]="maxHeight"
   #contentDiv
+  *ngIf="!collapsed"
+  data-cy="expandable-panel-content"
 >
   <ng-content></ng-content>
 </div>

package/src/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.ts

@@ -1,9 +1,14 @@
 import {
   ChangeDetectionStrategy,
   Component,
+  ContentChild,
   ElementRef,
   Input,
+  TemplateRef,
   ViewChild,
+  OnDestroy,
+  ChangeDetectorRef,
+  AfterViewInit,
 } from '@angular/core'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { CommonModule } from '@angular/common'
@@ -18,20 +23,41 @@ import { matAdd, matRemove } from '@ng-icons/material-icons/baseline'
   imports: [CommonModule, NgIcon],
   viewProviders: [provideIcons({ matAdd, matRemove })],
 })
-export class ExpandablePanelComponent {
-  @Input() title: string
-  @Input() collapsed = true
-  @ViewChild('contentDiv') contentDiv: ElementRef
-  maxHeight = this.setMaxHeight()
+export class ExpandablePanelComponent implements AfterViewInit, OnDestroy {
+  @Input() title?: string
+  @Input() iconColor? = ''
+  @ContentChild('titleTemplate') titleTemplate?: TemplateRef<HTMLElement>
+  @ViewChild('contentDiv') contentDiv?: ElementRef
+
+  private _collapsed = true
+  private contentObserver?: ResizeObserver
+
+  constructor(private readonly changeDetector: ChangeDetectorRef) {}
+
+  ngAfterViewInit() {
+    if (this.contentDiv) {
+      this.contentObserver = new ResizeObserver(() => {
+        this.changeDetector.detectChanges()
+      })
+      this.contentObserver.observe(this.contentDiv.nativeElement)
+    }
+  }
+
+  @Input() set collapsed(value: boolean) {
+    this._collapsed = value
+  }
+
+  get collapsed(): boolean {
+    return this._collapsed
+  }
 
   toggle(): void {
     this.collapsed = !this.collapsed
-    this.maxHeight = this.setMaxHeight()
   }
 
-  setMaxHeight() {
-    return `${
-      this.collapsed ? '0' : this.contentDiv.nativeElement.scrollHeight
-    }px`
+  ngOnDestroy() {
+    if (this.contentObserver) {
+      this.contentObserver.disconnect()
+    }
   }
 }

package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { MatTooltipModule } from '@angular/material/tooltip'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-form-field-wrapper',
@@ -9,7 +9,7 @@ import { TranslateModule } from '@ngx-translate/core'
   styleUrls: ['./form-field-wrapper.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatTooltipModule, CommonModule, TranslateModule],
+  imports: [MatTooltipModule, CommonModule, TranslateDirective],
 })
 export class FormFieldWrapperComponent {
   @Input() label?: string

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

@@ -31,11 +31,8 @@
     *ngFor="let item of items"
     (click)="handleRowClick(item)"
     data-cy="table-row"
-    [title]="
-      !item.extras?.edit && !isDraftPage
-        ? ('editor.record.lock.reason' | translate)
-        : ''
-    "
+    [attr.data-cy-title]="item.title"
+    [title]="getItemTitle(item) | translate"
   >
     <div
       class="relative h-0"
@@ -52,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,
+            (canEditItem(item) | async) === false,
           'group-hover:text-main group-hover:bg-gray-50':
-            item.extras?.edit || isDraftPage,
+            canEditItem(item) | async,
         }"
       >
         <ng-container

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

@@ -11,15 +11,21 @@ import { InteractiveTableColumnComponent } from './interactive-table-column/inte
 import { CommonModule } from '@angular/common'
 import { NgIconComponent, provideIcons } from '@ng-icons/core'
 import { iconoirNavArrowDown, iconoirNavArrowUp } from '@ng-icons/iconoir'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } 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.resourceType')
+marker('editor.record.lock.harvested')
+marker('editor.record.lock.owner')
 @Component({
   selector: 'gn-ui-interactive-table',
   templateUrl: './interactive-table.component.html',
   styleUrls: ['./interactive-table.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, NgIconComponent, TranslateModule],
+  imports: [CommonModule, NgIconComponent, TranslatePipe],
   providers: [provideIcons({ iconoirNavArrowDown, iconoirNavArrowUp })],
 })
 export class InteractiveTableComponent {
@@ -27,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>()
 
@@ -44,6 +51,19 @@ export class InteractiveTableComponent {
     }
   }
 
+  getItemTitle(item: CatalogRecord) {
+    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 ''
+  }
+
   handleRowClick(item: unknown) {
     this.itemClick.emit(item)
   }

package/src/libs/ui/layout/src/lib/max-lines/max-lines.component.html

@@ -13,7 +13,7 @@
 <div
   *ngIf="showToggleButton"
   (click)="toggleDisplay()"
-  class="text-secondary cursor-pointer pt-2.5"
+  class="text-primary cursor-pointer pt-2.5"
   data-cy="readMoreButton"
 >
   {{ (isExpanded ? 'ui.readLess' : 'ui.readMore') | translate }}

package/src/libs/ui/layout/src/lib/max-lines/max-lines.component.ts

@@ -9,7 +9,7 @@ import {
   ViewChild,
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslatePipe } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-max-lines',
@@ -17,7 +17,7 @@ import { TranslateModule } from '@ngx-translate/core'
   styleUrls: ['./max-lines.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, TranslateModule],
+  imports: [CommonModule, TranslatePipe],
 })
 export class MaxLinesComponent implements AfterViewInit, OnDestroy {
   @Input() maxLines = 6

package/src/libs/ui/layout/src/lib/pagination/pagination.component.ts

@@ -7,7 +7,7 @@ import {
   matChevronRight,
 } from '@ng-icons/material-icons/baseline'
 import { CommonModule } from '@angular/common'
-import { TranslateModule } from '@ngx-translate/core'
+import { TranslateDirective } from '@ngx-translate/core'
 import { Paginable } from '../paginable.interface'
 
 @Component({
@@ -20,7 +20,7 @@ import { Paginable } from '../paginable.interface'
     ButtonComponent,
     NgIcon,
     FormsModule,
-    TranslateModule,
+    TranslateDirective,
   ],
   viewProviders: [
     provideIcons({

package/src/libs/ui/layout/src/lib/previous-next-buttons/previous-next-buttons.component.html

@@ -1,18 +1,30 @@
-<div class="flex flex-row gap-x-4 items-center">
+<div class="flex flex-row gap-x-1 items-center">
   <gn-ui-button
     data-test="previousButton"
-    type="outline"
+    type="light"
+    [extraClass]="
+      'w-10 h-8 px-2 py-1 rounded-lg ' +
+      (!listComponent.isFirstPage
+        ? 'border border-gray-300'
+        : 'border border-gray-100')
+    "
     [disabled]="listComponent.isFirstPage"
     (buttonClick)="listComponent.goToPrevPage()"
   >
-    <ng-icon name="matArrowBack"></ng-icon>
+    <ng-icon name="matArrowBackIos"></ng-icon>
   </gn-ui-button>
   <gn-ui-button
     data-test="nextButton"
-    type="outline"
+    type="light"
+    [extraClass]="
+      'w-10 h-8 px-2 py-1 rounded-lg ' +
+      (!listComponent.isLastPage
+        ? 'border border-gray-300'
+        : 'border border-gray-100')
+    "
     [disabled]="listComponent.isLastPage"
     (buttonClick)="listComponent.goToNextPage()"
   >
-    <ng-icon name="matArrowForward"></ng-icon>
+    <ng-icon name="matArrowForwardIos"></ng-icon>
   </gn-ui-button>
 </div>

package/src/libs/ui/layout/src/lib/previous-next-buttons/previous-next-buttons.component.ts

@@ -5,8 +5,8 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import {
-  matArrowBack,
-  matArrowForward,
+  matArrowBackIos,
+  matArrowForwardIos,
 } from '@ng-icons/material-icons/baseline'
 import { Paginable } from '../paginable.interface'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
@@ -18,7 +18,7 @@ import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
   standalone: true,
   imports: [ButtonComponent, NgIconComponent],
   providers: [
-    provideIcons({ matArrowForward, matArrowBack }),
+    provideIcons({ matArrowBackIos, matArrowForwardIos }),
     provideNgIconsConfig({
       size: '0.875em',
     }),

package/src/libs/ui/layout/src/lib/sticky-header/sticky-header.component.ts

@@ -16,6 +16,7 @@ import {
 } from '@angular/core'
 import { animationFrameScheduler, fromEvent, Subscription } from 'rxjs'
 import { throttleTime } from 'rxjs/operators'
+import { CommonModule } from '@angular/common'
 
 /**
  * This component will make a block that will stay sticky on the top of the page,
@@ -32,6 +33,8 @@ import { throttleTime } from 'rxjs/operators'
   templateUrl: './sticky-header.component.html',
   styleUrls: ['./sticky-header.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
 })
 export class StickyHeaderComponent
   implements AfterViewInit, OnDestroy, OnInit, AfterViewChecked

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

@@ -0,0 +1,27 @@
+<gn-ui-cell-popin
+  #popinRef
+  [activePopin]="isTextTruncated"
+  [scrollContainer]="scrollContainer"
+  [cdkScrollContainer]="cdkScrollContainer"
+>
+  <div
+    cellContent
+    class="flex items-center justify-between w-full gap-2"
+    [class]="extraClass"
+  >
+    <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>