geonetwork-ui 2.8.0-dev.6ea037ab6 → 2.8.0-dev.6f988469c

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html

@@ -3,7 +3,11 @@
     ghostClass="h-[178px]"
     [showContent]="fieldReady('abstract')"
   >
-    <gn-ui-max-lines [maxLines]="6" *ngIf="metadata.abstract">
+    <gn-ui-max-lines
+      [maxLines]="6"
+      *ngIf="metadata.abstract"
+      data-test="metadata-info-abstract"
+    >
       <div class="mb-6">
         <gn-ui-markdown-parser
           [textContent]="metadata.abstract"
@@ -101,19 +105,31 @@
 <gn-ui-expandable-panel
   *ngIf="
     (metadata.kind === 'dataset' && metadata.lineage) ||
+    resourceContact ||
+    metadata.resourceCreated ||
+    metadata.resourcePublished ||
     metadata.resourceUpdated ||
-    metadata.updateFrequency ||
-    (metadata.kind === 'dataset' && metadata.status)
+    (metadata.kind === 'dataset' && metadata.updateFrequency) ||
+    metadata.otherLanguages?.length ||
+    (metadata.kind === 'dataset' && temporalExtent)
   "
   [title]="'record.metadata.details' | translate"
   data-test="details-panel"
 >
-  <div *ngIf="metadata.lineage" class="text-gray-900 flex flex-col mt-4 gap-2">
+  <div
+    *ngIf="metadata.kind === 'dataset' && metadata.lineage"
+    class="text-gray-900 flex flex-col mt-4 gap-2"
+    data-test="details-panel-lineage"
+  >
     <p class="whitespace-pre-line break-words text-gray-900" gnUiLinkify>
       {{ metadata.lineage }}
     </p>
   </div>
-  <div class="flex flex-row gap-6 mt-5 mb-8" *ngIf="resourceContact">
+  <div
+    class="flex flex-row gap-6 mt-5 mb-8 resource-contact"
+    *ngIf="resourceContact"
+    data-test="details-panel-resource-contact"
+  >
     <div
       *ngIf="resourceContact.organization?.logoUrl?.href"
       class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
@@ -165,19 +181,40 @@
   <div
     class="py-6 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-6 gap-x-[20px] text-gray-700"
   >
-    <div *ngIf="metadata.resourceCreated">
+    <div
+      *ngIf="metadata.resourceCreated"
+      data-test="details-panel-resource-created"
+    >
       <p class="text-sm" translate>record.metadata.creation</p>
-      <p class="text-primary font-medium mt-1">
-        {{ formatDate(metadata.resourceCreated) }}
-      </p>
+      <p
+        class="text-primary font-medium mt-1 resource-created"
+        [gnUiHumanizeDate]="metadata.resourceCreated"
+      ></p>
     </div>
-    <div *ngIf="metadata.resourcePublished">
+    <div
+      *ngIf="metadata.resourcePublished"
+      data-test="details-panel-resource-published"
+    >
       <p class="text-sm" translate>record.metadata.publication</p>
-      <p class="text-primary font-medium mt-1">
-        {{ formatDate(metadata.resourcePublished) }}
-      </p>
+      <p
+        class="text-primary font-medium mt-1 resource-published"
+        [gnUiHumanizeDate]="metadata.resourcePublished"
+      ></p>
+    </div>
+    <div
+      *ngIf="metadata.resourceUpdated"
+      data-test="details-panel-resource-updated"
+    >
+      <p class="text-sm" translate>record.metadata.update</p>
+      <p
+        class="text-primary font-medium mt-1 resource-updated"
+        [gnUiHumanizeDate]="metadata.resourceUpdated"
+      ></p>
     </div>
-    <div *ngIf="updateFrequency">
+    <div
+      *ngIf="metadata.kind === 'dataset' && metadata.updateFrequency"
+      data-test="details-panel-update-frequency"
+    >
       <p class="text-sm" translate>record.metadata.updateFrequency</p>
       <p
         class="text-primary font-medium mt-1 updateFrequency"
@@ -187,11 +224,14 @@
         {{ updateFrequency }}
       </p>
     </div>
-    <div *ngIf="metadata.otherLanguages?.length">
+    <div
+      *ngIf="metadata.otherLanguages?.length"
+      data-test="details-panel-other-languages"
+    >
       <p class="text-sm mb-1" translate>record.metadata.languages</p>
       <div class="flex flex-row gap-1 flex-wrap">
         <p
-          class="text-primary font-medium"
+          class="text-primary font-medium other-languages"
           translate
           *ngFor="let language of metadata.otherLanguages"
         >
@@ -199,9 +239,14 @@
         </p>
       </div>
     </div>
-    <div *ngIf="temporalExtent">
+    <div
+      *ngIf="metadata.kind === 'dataset' && temporalExtent"
+      data-test="details-panel-temporal-extent"
+    >
       <p class="text-sm" translate>record.metadata.temporalExtent</p>
-      <div class="flex flex-row gap-1 mb-1 text-primary font-medium">
+      <div
+        class="flex flex-row gap-1 mb-1 text-primary font-medium temporal-extent"
+      >
         <p
           *ngIf="temporalExtent.start && temporalExtent.end"
           translate
@@ -252,9 +297,10 @@
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">
       <p class="text-sm" translate>record.metadata.updatedOn</p>
-      <p class="text-primary font-medium">
-        {{ metadata.recordUpdated && formatDateTime(metadata.recordUpdated) }}
-      </p>
+      <p
+        class="text-primary font-medium"
+        [gnUiHumanizeDate]="metadata.recordUpdated"
+      ></p>
     </div>
     <div *ngIf="metadata.landingPage">
       <p class="text-sm" translate>record.metadata.sheet</p>

package/src/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts

@@ -26,7 +26,7 @@ import { matOpenInNew } from '@ng-icons/material-icons/baseline'
 import { matMailOutline } from '@ng-icons/material-icons/outline'
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component'
 import { GnUiLinkifyDirective } from './linkify.directive'
-
+import { GnUiHumanizeDateDirective } from '../../../../../../libs/util/shared/src'
 import { CommonModule } from '@angular/common'
 import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
 
@@ -49,6 +49,7 @@ import { SpatialExtentComponent } from '../../../../../../libs/ui/map/src'
     CopyTextButtonComponent,
     NgIcon,
     GnUiLinkifyDirective,
+    GnUiHumanizeDateDirective,
     SpatialExtentComponent,
   ],
   viewProviders: [
@@ -146,12 +147,4 @@ export class MetadataInfoComponent {
   onKeywordClick(keyword: Keyword) {
     this.keyword.emit(keyword)
   }
-
-  formatDate(date: Date): string {
-    return this.dateService.formatDate(date)
-  }
-
-  formatDateTime(date: Date): string {
-    return this.dateService.formatDateTime(date)
-  }
 }

package/src/libs/ui/elements/src/lib/stac-items-result-grid/stac-items-result-grid.component.html

@@ -0,0 +1,13 @@
+<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-[10px]">
+  <div *ngFor="let item of items">
+    <div
+      data-cy="stac-item-card"
+      class="h-[173px] flex flex-col justify-between gap-4 bg-white rounded-lg border border-gray-300 px-5 py-3 mx-auto"
+    >
+      <h2 class="text-xl text-black line-clamp-4 break-words">
+        {{ item.id }}
+      </h2>
+      <p class="truncate">{{ item.properties.datetime }}</p>
+    </div>
+  </div>
+</div>

package/src/libs/ui/elements/src/lib/stac-items-result-grid/stac-items-result-grid.component.ts

@@ -0,0 +1,15 @@
+import { CommonModule } from '@angular/common'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { StacItem } from '@camptocamp/ogc-client'
+
+@Component({
+  selector: 'gn-ui-stac-items-result-grid',
+  standalone: true,
+  imports: [CommonModule],
+  templateUrl: './stac-items-result-grid.component.html',
+  styleUrl: './stac-items-result-grid.component.css',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class StacItemsResultGridComponent {
+  @Input() items: StacItem[] = []
+}

package/src/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.html

@@ -13,7 +13,7 @@
     </div>
     <div class="p-4 flex flex-col">
       <span>{{ userFeedbackParent.authorName }}</span>
-      <span> {{ userFeedbackParent.date | timeSince }}</span>
+      <span [gnUiHumanizeDate]="userFeedbackParent.date"></span>
     </div>
   </div>
   <div data-cy="commentText" class="mt-4 whitespace-pre-line">

package/src/libs/ui/elements/src/lib/user-feedback-item/user-feedback-item.component.ts

@@ -11,13 +11,13 @@ import {
   UserFeedbackViewModel,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user'
-import { TimeSincePipe } from './time-since.pipe'
 import { CommonModule } from '@angular/common'
 import { ButtonComponent, TextAreaComponent } from '../../../../../../libs/ui/inputs/src'
 import { TranslatePipe } from '@ngx-translate/core'
 import { SpinningLoaderComponent } from '../../../../../../libs/ui/widgets/src'
 import { NgIcon, provideIcons } from '@ng-icons/core'
 import { matSendOutline } from '@ng-icons/material-icons/outline'
+import { GnUiHumanizeDateDirective } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-user-feedback-item',
@@ -27,11 +27,11 @@ import { matSendOutline } from '@ng-icons/material-icons/outline'
   standalone: true,
   imports: [
     CommonModule,
-    TimeSincePipe,
     TextAreaComponent,
     TranslatePipe,
     ButtonComponent,
     SpinningLoaderComponent,
+    GnUiHumanizeDateDirective,
     NgIcon,
   ],
   viewProviders: [

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

@@ -24,3 +24,4 @@ export * from './lib/text-input/text-input.component'
 export * from './lib/url-input/url-input.component'
 export * from './lib/viewport-intersector/viewport-intersector.component'
 export * from './lib/search-feature-catalog/search-feature-catalog.component'
+export * from './lib/date-range-inputs/date-range-inputs.component'

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts

@@ -5,7 +5,11 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { MatNativeDateModule } from '@angular/material/core'
+import {
+  DateAdapter,
+  MAT_DATE_LOCALE,
+  MatNativeDateModule,
+} from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { ButtonComponent } from '../button/button.component'
 import {
@@ -14,6 +18,7 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { iconoirCalendar } from '@ng-icons/iconoir'
+import { TranslateService } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-date-picker',
@@ -32,9 +37,20 @@ import { iconoirCalendar } from '@ng-icons/iconoir'
     provideNgIconsConfig({
       size: '1.5rem',
     }),
+    {
+      provide: MAT_DATE_LOCALE,
+      useFactory: (locale: string) => locale,
+    },
   ],
 })
 export class DatePickerComponent {
   @Input() date: Date
   @Output() dateChange = new EventEmitter<Date>()
+
+  constructor(
+    private dateAdapter: DateAdapter<Date>,
+    private translate: TranslateService
+  ) {
+    this.dateAdapter.setLocale(this.translate.currentLang)
+  }
 }

package/src/libs/ui/inputs/src/lib/date-range-inputs/date-range-inputs.component.html

@@ -0,0 +1,15 @@
+<div class="m-8">
+  <p class="mb-4" translate>daterange.filter.period</p>
+  <p translate>daterange.filter.from</p>
+  <gn-ui-date-picker
+    id="start-date-picker"
+    [date]="temporalExtent?.start"
+    (dateChange)="onStartDateChange($event)"
+  ></gn-ui-date-picker>
+  <p class="mt-4" translate>daterange.filter.to</p>
+  <gn-ui-date-picker
+    id="end-date-picker"
+    [date]="temporalExtent?.end"
+    (dateChange)="onEndDateChange($event)"
+  ></gn-ui-date-picker>
+</div>

package/src/libs/ui/inputs/src/lib/date-range-inputs/date-range-inputs.component.ts

@@ -0,0 +1,41 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { DatePickerComponent } from '../date-picker/date-picker.component'
+import { DatasetTemporalExtent } from '../../../../../../libs/common/domain/src/lib/model/record/metadata.model'
+import { TranslateDirective } from '@ngx-translate/core'
+import { CommonModule } from '@angular/common'
+
+@Component({
+  selector: 'gn-ui-date-range-inputs',
+  standalone: true,
+  imports: [CommonModule, TranslateDirective, DatePickerComponent],
+  templateUrl: './date-range-inputs.component.html',
+  styleUrl: './date-range-inputs.component.css',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DateRangeInputsComponent {
+  @Input() temporalExtent: DatasetTemporalExtent | null
+  @Output() temporalExtentChange =
+    new EventEmitter<DatasetTemporalExtent | null>()
+
+  onStartDateChange(date: Date) {
+    this.temporalExtent = {
+      ...this.temporalExtent,
+      start: date,
+    }
+    this.temporalExtentChange.emit(this.temporalExtent)
+  }
+
+  onEndDateChange(date: Date) {
+    this.temporalExtent = {
+      ...this.temporalExtent,
+      end: date,
+    }
+    this.temporalExtentChange.emit(this.temporalExtent)
+  }
+}

package/src/libs/ui/layout/src/lib/paginable.interface.ts

@@ -6,9 +6,9 @@
 export interface Paginable {
   isFirstPage: boolean
   isLastPage: boolean
-  pagesCount: number
-  currentPage: number
-  goToPage(index: number): void
+  pagesCount?: number
+  currentPage?: number
+  goToPage?(index: number): void
   goToNextPage(): void
   goToPrevPage(): void
 }

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

@@ -3,28 +3,34 @@
     data-test="previousButton"
     type="light"
     [extraClass]="
-      'w-10 h-8 px-2 py-1 rounded-lg ' +
+      'w-auto min-w-10 h-8 px-2 py-1 rounded-lg ' +
       (!listComponent.isFirstPage
-        ? 'border border-gray-300'
-        : 'border border-gray-100')
+        ? 'border border-gray-300 text-main'
+        : 'border border-gray-100 text-gray-300')
     "
     [disabled]="listComponent.isFirstPage"
     (buttonClick)="listComponent.goToPrevPage()"
   >
     <ng-icon name="matArrowBackIos"></ng-icon>
+    <span *ngIf="displayLabels" class="ml-2" translate
+      >pagination.previousPage</span
+    >
   </gn-ui-button>
   <gn-ui-button
     data-test="nextButton"
     type="light"
     [extraClass]="
-      'w-10 h-8 px-2 py-1 rounded-lg ' +
+      'w-auto min-w-10 h-8 px-2 py-1 rounded-lg ' +
       (!listComponent.isLastPage
-        ? 'border border-gray-300'
-        : 'border border-gray-100')
+        ? 'border border-gray-300 text-main'
+        : 'border border-gray-100 text-gray-300')
     "
     [disabled]="listComponent.isLastPage"
     (buttonClick)="listComponent.goToNextPage()"
   >
+    <span *ngIf="displayLabels" class="mr-2" translate
+      >pagination.nextPage</span
+    >
     <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

@@ -10,13 +10,15 @@ import {
 } from '@ng-icons/material-icons/baseline'
 import { Paginable } from '../paginable.interface'
 import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
+import { CommonModule } from '@angular/common'
+import { TranslateDirective } from '@ngx-translate/core'
 
 @Component({
   selector: 'gn-ui-previous-next-buttons',
   templateUrl: './previous-next-buttons.component.html',
   styleUrls: ['./previous-next-buttons.component.css'],
   standalone: true,
-  imports: [ButtonComponent, NgIconComponent],
+  imports: [CommonModule, ButtonComponent, NgIconComponent, TranslateDirective],
   providers: [
     provideIcons({ matArrowBackIos, matArrowForwardIos }),
     provideNgIconsConfig({
@@ -26,4 +28,5 @@ import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
 })
 export class PreviousNextButtonsComponent {
   @Input() listComponent: Paginable
+  @Input() displayLabels = false
 }

package/src/libs/util/i18n/src/lib/date-locales.ts

@@ -0,0 +1,63 @@
+import { LanguageCode2 } from './language-codes'
+import {
+  ar,
+  az,
+  ca,
+  cs,
+  cy,
+  da,
+  de,
+  enUS,
+  es,
+  fi,
+  fr,
+  hy,
+  is,
+  it,
+  ka,
+  ko,
+  Locale,
+  nl,
+  nn,
+  pl,
+  pt,
+  ru,
+  sk,
+  sv,
+  tr,
+  uk,
+  zhCN,
+} from 'date-fns/locale'
+
+// all 2-char language codes should be listed here
+const locales: Record<LanguageCode2, Locale> = {
+  en: enUS,
+  nl: nl,
+  fr: fr,
+  de: de,
+  ko: ko,
+  es: es,
+  cs: cs,
+  ca: ca,
+  fi: fi,
+  is: is,
+  it: it,
+  pt: pt,
+  ru: ru,
+  zh: zhCN,
+  sk: sk,
+  ar: ar,
+  da: da,
+  no: nn,
+  pl: pl,
+  sv: sv,
+  tr: tr,
+  hy: hy,
+  az: az,
+  ka: ka,
+  uk: uk,
+  cy: cy,
+  rm: enUS, // locale is unavailable
+}
+
+export default locales

package/src/libs/util/shared/src/index.ts

@@ -4,3 +4,4 @@ export * from './lib/links'
 export * from './lib/image-fallback.directive'
 export * from './lib/gn-ui-version'
 export * from './lib/record'
+export * from './lib/humanize-date.directive'

package/src/libs/util/shared/src/lib/humanize-date.directive.ts

@@ -0,0 +1,35 @@
+import { Renderer2, Directive, ElementRef, Input, OnInit } from '@angular/core'
+import { DateService } from './services/date.service'
+
+@Directive({
+  selector: '[gnUiHumanizeDate]',
+  standalone: true,
+})
+export class GnUiHumanizeDateDirective implements OnInit {
+  @Input() gnUiHumanizeDate: Date | string
+
+  constructor(
+    private dateService: DateService,
+    private el: ElementRef,
+    private renderer: Renderer2
+  ) {}
+
+  async ngOnInit() {
+    await this.updateElement()
+  }
+
+  private async updateElement(): Promise<void> {
+    const dateValue = this.gnUiHumanizeDate
+
+    const fullDateTime = this.dateService.formatDateTime(dateValue)
+    const relativeDate =
+      await this.dateService.formatRelativeDateTime(dateValue)
+
+    this.renderer.setAttribute(this.el.nativeElement, 'title', fullDateTime)
+    this.renderer.setProperty(
+      this.el.nativeElement,
+      'textContent',
+      relativeDate
+    )
+  }
+}

package/src/libs/util/shared/src/lib/links/link-classifier.service.ts

@@ -41,6 +41,8 @@ export class LinkClassifierService {
             return [LinkUsage.API]
           case 'postgis':
             return [LinkUsage.UNKNOWN]
+          case 'stac':
+            return [LinkUsage.API]
           default:
             return [LinkUsage.UNKNOWN]
         }

package/src/libs/util/shared/src/lib/services/date.service.ts

@@ -1,10 +1,18 @@
 import { Injectable } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
+import { type Locale } from 'date-fns/locale'
+import { formatDistance } from 'date-fns/formatDistance'
+
+const DEFAULT_LANGUAGE = 'en'
 
 @Injectable({
   providedIn: 'root',
 })
 export class DateService {
+  dateLocales = import('../../../../../../libs/util/i18n/src/lib/date-locales').then(
+    (obj) => obj.default
+  )
+
   constructor(private translateService: TranslateService) {}
 
   private getDateObject(date: Date | string): Date {
@@ -22,11 +30,17 @@ export class DateService {
     locale: string
     dateObj: Date
   } {
-    const locale = this.translateService.currentLang || 'en-US'
+    const locale = this.translateService.currentLang || DEFAULT_LANGUAGE
     const dateObj = this.getDateObject(date)
     return { locale, dateObj }
   }
 
+  private async getDateLocale(): Promise<Locale> {
+    const lang = this.translateService.currentLang || DEFAULT_LANGUAGE
+    const locales = await this.dateLocales
+    return locales[lang]
+  }
+
   formatDate(
     date: Date | string,
     options?: Intl.DateTimeFormatOptions
@@ -42,4 +56,16 @@ export class DateService {
     const { locale, dateObj } = this.getLocaleAndDate(date)
     return dateObj.toLocaleString(locale, options)
   }
+
+  async formatRelativeDateTime(date: Date | string): Promise<string> {
+    const dateObj = this.getDateObject(date)
+
+    const now = new Date()
+    const locale = await this.getDateLocale()
+
+    return formatDistance(dateObj, now, {
+      addSuffix: true,
+      locale: locale,
+    })
+  }
 }