geonetwork-ui 2.6.0-dev.b306f1194 → 2.6.0-dev.c49d02679

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

@@ -12,7 +12,13 @@ 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 { 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',
@@ -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/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/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>

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

@@ -0,0 +1,91 @@
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  ViewChild,
+  NgZone,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { provideIcons, NgIconComponent } from '@ng-icons/core'
+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 { CellPopinComponent } from '../cell-popin/cell-popin.component'
+
+@Component({
+  selector: 'gn-ui-truncated-text',
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    MatButtonModule,
+    OverlayModule,
+    ButtonComponent,
+    CellPopinComponent,
+    NgIconComponent,
+  ],
+  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
+
+  private readonly resizeObserver: ResizeObserver
+  private readonly mutationObserver: MutationObserver
+
+  constructor(
+    private readonly cd: ChangeDetectorRef,
+    private readonly ngZone: NgZone
+  ) {
+    this.resizeObserver = new ResizeObserver(() => {
+      this.ngZone.run(() => this.checkTextTruncation())
+    })
+
+    this.mutationObserver = new MutationObserver(() => {
+      this.ngZone.run(() => {
+        this.checkTextTruncation()
+      })
+    })
+  }
+
+  ngAfterViewInit() {
+    const element = this.textElement.nativeElement
+    this.resizeObserver?.observe(element)
+    this.mutationObserver?.observe(element.parentElement, {
+      attributes: true,
+      childList: true,
+      subtree: true,
+    })
+    this.checkTextTruncation()
+  }
+
+  ngOnDestroy() {
+    this.resizeObserver?.disconnect()
+    this.mutationObserver?.disconnect()
+  }
+
+  private checkTextTruncation() {
+    const element = this.textElement.nativeElement
+
+    this.isTextTruncated = element.scrollWidth > element.clientWidth
+    this.cd.detectChanges()
+  }
+}

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

@@ -1,17 +1,13 @@
 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],
-  providers: [
-    provideNgIconsConfig({
-      size: '0.9em',
-    }),
-  ],
+  providers: [],
   declarations: [StickyHeaderComponent, AnchorLinkDirective],
   exports: [StickyHeaderComponent, AnchorLinkDirective],
 })

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

@@ -3,3 +3,4 @@ export * from './lib/components/map-container/map-settings.token'
 export * from './lib/components/feature-detail/feature-detail.component'
 export * from './lib/components/map-legend/map-legend.component'
 export * from './lib/map-utils'
+export * from './lib/components/spatial-extent/spatial-extent.component'

package/src/libs/ui/map/src/lib/components/feature-detail/feature-detail.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="feature" class="root">
-  <div class="property" *ngFor="let propName of properties">
-    <div>{{ propName }}</div>
-    <div class="font-bold">{{ feature.properties[propName] }}</div>
+  <div class="property" *ngFor="let prop of properties | keyvalue">
+    <div>{{ prop.key }}</div>
+    <div class="font-bold">{{ prop.value }}</div>
   </div>
 </div>

package/src/libs/ui/map/src/lib/components/feature-detail/feature-detail.component.ts

@@ -1,6 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import type { Feature } from 'geojson'
+import { DatasetFeatureCatalog } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 const geometryKeys = ['geometry', 'the_geom']
 
@@ -14,11 +15,34 @@ const geometryKeys = ['geometry', 'the_geom']
 })
 export class FeatureDetailComponent {
   @Input() feature: Feature
+  _featureAttributes = []
+  @Input() set featureCatalog(value: DatasetFeatureCatalog) {
+    if (value) this._featureAttributes = value.featureTypes[0].attributes
+  }
 
   get properties() {
     if (!this.feature) return []
-    return Object.keys(this.feature.properties).filter(
-      (prop) => !geometryKeys.includes(prop)
-    )
+    return this.setProperties()
+  }
+
+  setProperties() {
+    const properties = Object.keys(this.feature.properties)
+      .filter((p) => !geometryKeys.includes(p))
+      .reduce((acc, p) => {
+        let key = p
+        if (this._featureAttributes.length) {
+          const matchingAttribute = this._featureAttributes.find(
+            (attr) => attr.name === p
+          )
+
+          if (matchingAttribute && matchingAttribute.code) {
+            key = matchingAttribute.code
+          }
+        }
+        acc[key] = this.feature.properties[p]
+        return acc
+      }, {})
+
+    return properties
   }
 }

package/src/libs/ui/map/src/lib/components/spatial-extent/spatial-extent.component.html

@@ -0,0 +1,4 @@
+<gn-ui-map-container
+  class="h-full w-full"
+  [context]="mapContext$ | async"
+></gn-ui-map-container>

package/src/libs/{feature/editor/src/lib/components/record-form/form-field/form-field-map-container/form-field-map-container.component.ts → ui/map/src/lib/components/spatial-extent/spatial-extent.component.ts}

@@ -1,27 +1,26 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { Component, Input } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { Geometry } from 'geojson'
 import GeoJSON, { GeoJSONFeatureCollection } from 'ol/format/GeoJSON'
-import { DatasetSpatialExtent } from '../../../../../../../../../libs/common/domain/src/lib/model/record'
 import { Polygon } from 'ol/geom'
 import {
   createViewFromLayer,
   MapContext,
   MapContextLayer,
 } from '@geospatial-sdk/core'
-import { MapContainerComponent } from '../../../../../../../../../libs/ui/map/src'
+import { MapContainerComponent } from '../map-container/map-container.component'
 import { BehaviorSubject, Observable } from 'rxjs'
 import { switchMap } from 'rxjs/operators'
+import { DatasetSpatialExtent } from '../../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
-  selector: 'gn-ui-form-field-map-container',
+  selector: 'gn-ui-spatial-extent',
   standalone: true,
   imports: [CommonModule, MapContainerComponent],
-  templateUrl: './form-field-map-container.component.html',
-  styleUrls: ['./form-field-map-container.component.css'],
-  changeDetection: ChangeDetectionStrategy.OnPush,
+  templateUrl: './spatial-extent.component.html',
+  styleUrl: './spatial-extent.component.css',
 })
-export class FormFieldMapContainerComponent {
+export class SpatialExtentComponent {
   @Input() set spatialExtents(value: DatasetSpatialExtent[]) {
     this.spatialExtents$.next(value)
   }
@@ -58,6 +57,7 @@ export class FormFieldMapContainerComponent {
         style: {
           'stroke-color': 'black',
           'stroke-width': 2,
+          'fill-color': 'rgba(153, 153, 153, 0.3)',
         },
       }
       const view = await createViewFromLayer(layer)

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

@@ -16,5 +16,7 @@ export * from './lib/record-preview-text/record-preview-text.component'
 export * from './lib/record-preview-title/record-preview-title.component'
 export * from './lib/record-metric/record-metric.component'
 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'