geonetwork-ui 2.6.0-dev.26001d617 → 2.6.0-dev.34911f182

package/src/libs/ui/dataviz/src/lib/data-table/data-table.component.ts

@@ -61,13 +61,14 @@ export interface TableItemModel {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DataTableComponent implements OnInit, AfterViewInit, OnChanges {
+  _featureAttributes = []
+  @Input() set featureAttributes(value: { value: string; label: string }[]) {
+    this._featureAttributes = value
+    this.properties$.next(value.map((attr) => attr.value))
+  }
   @Input() set dataset(value: BaseReader) {
-    this.properties$.next(null)
     this.dataset_ = value
     this.dataset_.load()
-    this.dataset_.properties.then((properties) =>
-      this.properties$.next(properties.map((p) => p.name))
-    )
     this.dataset_.info.then((info) => (this.count = info.itemsCount))
   }
   @Input() activeId: TableItemId

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

@@ -16,3 +16,4 @@ export * from './lib/pagination-dots/pagination-dots.component'
 export * from './lib/previous-next-buttons/previous-next-buttons.component'
 export * from './lib/paginable.interface'
 export * from './lib/ui-layout.module'
+export * from './lib/truncated-text/truncated-text.component'

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

@@ -0,0 +1,46 @@
+<div
+  class="flex items-center justify-between w-full gap-2"
+  cdkOverlayOrigin
+  #trigger="cdkOverlayOrigin"
+>
+  <span #textElement class="truncate">
+    {{ text }}
+  </span>
+  <gn-ui-button
+    *ngIf="isTextTruncated"
+    type="outline"
+    extraClass="w-10 h-8 border rounded-lg"
+    (buttonClick)="toggleOverlay()"
+  >
+    <ng-icon name="iconoirExpand" size="24"> </ng-icon>
+  </gn-ui-button>
+
+  <ng-template
+    cdkConnectedOverlay
+    [cdkConnectedOverlayOrigin]="trigger"
+    [cdkConnectedOverlayOpen]="isOpen"
+    [cdkConnectedOverlayPositions]="[
+      {
+        originX: 'end',
+        originY: 'top',
+        overlayX: 'end',
+        overlayY: 'top',
+      },
+    ]"
+    (detach)="isOpen = false"
+  >
+    <div class="bg-white shadow-lg border border-gray-300 flex">
+      <div class="w-64">
+        <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>

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

@@ -0,0 +1,62 @@
+import {
+  AfterViewInit,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  Input,
+  ViewChild,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { provideIcons } from '@ng-icons/core'
+import { iconoirExpand, iconoirReduce } from '@ng-icons/iconoir'
+import { TranslateModule } from '@ngx-translate/core'
+import { MatButtonModule } from '@angular/material/button'
+import { OverlayModule } from '@angular/cdk/overlay'
+import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
+import { NgIconComponent } from '@ng-icons/core'
+
+@Component({
+  selector: 'gn-ui-truncated-text',
+  standalone: true,
+  imports: [
+    CommonModule,
+    TranslateModule,
+    MatButtonModule,
+    OverlayModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [provideIcons({ iconoirExpand, iconoirReduce })],
+  templateUrl: './truncated-text.component.html',
+  styles: [],
+})
+export class TruncatedTextComponent implements AfterViewInit {
+  @Input() text = ''
+  @ViewChild('textElement') textElement: ElementRef<HTMLElement>
+  isTextTruncated = false
+  isOpen = false
+
+  constructor(private cd: ChangeDetectorRef) {}
+
+  ngAfterViewInit() {
+    this.checkTextTruncation()
+  }
+
+  ngOnChange() {
+    this.checkTextTruncation()
+  }
+
+  toggleOverlay() {
+    this.isOpen = !this.isOpen
+  }
+
+  close() {
+    this.isOpen = false
+  }
+
+  private checkTextTruncation() {
+    const element = this.textElement.nativeElement
+    this.isTextTruncated = element.scrollWidth > element.clientWidth
+    this.cd.detectChanges()
+  }
+}

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.ts

@@ -57,6 +57,7 @@ export class SpatialExtentComponent {
         style: {
           'stroke-color': 'black',
           'stroke-width': 2,
+          'fill-color': 'rgba(153, 153, 153, 0.3)',
         },
       }
       const view = await createViewFromLayer(layer)

package/translations/en.json

@@ -569,6 +569,8 @@
   "tooltip.url.open": "Open URL",
   "ui.readLess": "Read less",
   "ui.readMore": "Read more",
+  "ui.hideFullText": "Hide complete text",
+  "ui.showAllText": "Show all text",
   "wfs.feature.limit": "Too many features to display the WFS layer!",
   "wfs.featuretype.notfound": "No matching feature type was found in the service",
   "wfs.geojsongml.notsupported": "This service does not support the GeoJSON or GML format",

package/translations/fr.json

@@ -569,6 +569,8 @@
   "tooltip.url.open": "Ouvrir l'URL",
   "ui.readLess": "Réduire",
   "ui.readMore": "Lire la suite",
+  "ui.hideFullText": "Masquer le texte complet",
+  "ui.showAllText": "Tout afficher",
   "wfs.feature.limit": "Trop d'objets pour afficher la couche WFS !",
   "wfs.featuretype.notfound": "La classe d'objets n'a pas été trouvée dans le service",
   "wfs.geojsongml.notsupported": "Le service ne supporte pas le format GeoJSON ou GML",