geonetwork-ui 2.2.0-dev.9ae0a68b → 2.2.0-dev.a9d33529

package/src/libs/feature/search/src/lib/results-table/results-table.component.html

@@ -0,0 +1,135 @@
+<div>
+  <div class="flex" data-cy="records-information">
+    <div
+      translate
+      class="my-8 ml-4 block text-gray-800"
+      [translateParams]="{
+        displayed: (records$ | async).length,
+        hits: (recordCount$ | async)
+      }"
+    >
+      results.records.hits.displayedOn
+    </div>
+    <div
+      *ngIf="(selectedRecords$ | async).length as selectedRecordCount"
+      class="my-8 ml-6 block text-gray-400 selected-records"
+      translate
+      [translateParams]="{ amount: selectedRecordCount }"
+    >
+      results.records.hits.selected
+    </div>
+  </div>
+
+  <gn-ui-interactive-table
+    [items]="records$ | async"
+    (itemClick)="handleRecordClick($event)"
+  >
+    <!-- SELECTED COLUMN -->
+    <gn-ui-interactive-table-column>
+      <ng-template #header>
+        <gn-ui-checkbox
+          [checked]="isAllSelected() | async"
+          [indeterminate]="isSomeSelected() | async"
+          (changed)="toggleSelectAll()"
+          type="default"
+          class="-m-2 mr-3"
+        >
+        </gn-ui-checkbox>
+      </ng-template>
+      <ng-template #cell let-item>
+        <gn-ui-checkbox
+          [checked]="isChecked(item) | async"
+          (changed)="handleRecordSelectedChange($event, item)"
+          class="-m-2"
+          type="default"
+        ></gn-ui-checkbox>
+      </ng-template>
+    </gn-ui-interactive-table-column>
+
+    <!-- TITLE COLUMN -->
+    <gn-ui-interactive-table-column
+      [sortable]="true"
+      [activeSort]="isSortedBy('resourceTitleObject.default.keyword') | async"
+      (sortChange)="setSortBy('resourceTitleObject.default.keyword', $event)"
+    >
+      <ng-template #header>
+        <span translate>record.metadata.title</span>
+      </ng-template>
+      <ng-template #cell let-item>
+        {{ item.title }}
+      </ng-template>
+    </gn-ui-interactive-table-column>
+
+    <!-- FORMATS COLUMN -->
+    <gn-ui-interactive-table-column>
+      <ng-template #header>
+        <span translate>record.metadata.formats</span>
+      </ng-template>
+      <ng-template #cell let-item>
+        <div
+          class="flex justify-start items-center gap-2"
+          *ngIf="getRecordFormats(item) as formats"
+          [title]="formats.join(', ')"
+        >
+          <span
+            class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
+            [style.background-color]="getBadgeColor(formats[0])"
+            *ngIf="formats[0]"
+          >
+            {{ formats[0] }}
+          </span>
+          <span
+            class="badge-btn min-w-[45px] text-sm text-white px-2 flex-shrink-0"
+            [style.background-color]="getBadgeColor(formats[1])"
+            *ngIf="formats[1]"
+          >
+            {{ formats[1] }}
+          </span>
+          <div class="flex-shrink-0" *ngIf="formats.slice(2).length > 0">
+            <span>+{{ formats.slice(2).length }}</span>
+          </div>
+        </div>
+        <div *ngIf="!getRecordFormats(item)"></div>
+      </ng-template>
+    </gn-ui-interactive-table-column>
+
+    <!-- OWNER COLUMN -->
+    <gn-ui-interactive-table-column
+      [sortable]="true"
+      [activeSort]="isSortedBy('recordOwner') | async"
+      (sortChange)="setSortBy('recordOwner', $event)"
+    >
+      <ng-template #header>
+        <span translate>record.metadata.author</span>
+      </ng-template>
+      <ng-template #cell let-item>
+        <mat-icon class="material-symbols-outlined">person</mat-icon>
+        <span>{{ formatUserInfo(item.extras?.ownerInfo) }}</span>
+      </ng-template>
+    </gn-ui-interactive-table-column>
+
+    <!-- STATUS COLUMN -->
+    <gn-ui-interactive-table-column>
+      <ng-template #header>
+        <span translate>record.metadata.status</span>
+      </ng-template>
+      <ng-template #cell let-item>
+        {{ item.status }}
+      </ng-template>
+    </gn-ui-interactive-table-column>
+
+    <!-- UPDATE DATE COLUMN -->
+    <gn-ui-interactive-table-column
+      [sortable]="true"
+      [activeSort]="isSortedBy('changeDate') | async"
+      (sortChange)="setSortBy('changeDate', $event)"
+    >
+      <ng-template #header>
+        <span translate>record.metadata.updatedOn</span>
+      </ng-template>
+      <ng-template #cell let-item>
+        {{ dateToString(item.recordUpdated) }}
+      </ng-template>
+    </gn-ui-interactive-table-column>
+  </gn-ui-interactive-table>
+</div>

package/src/libs/feature/search/src/lib/results-table/results-table.component.ts

@@ -0,0 +1,165 @@
+import { Component, EventEmitter, Output } from '@angular/core'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  FileFormat,
+  getBadgeColor,
+  getFileFormat,
+  getFormatPriority,
+} from '../../../../../../libs/util/shared/src'
+import { UiInputsModule } from '../../../../../../libs/ui/inputs/src'
+import {
+  InteractiveTableColumnComponent,
+  InteractiveTableComponent,
+} from '../../../../../../libs/ui/layout/src'
+import { MatIconModule } from '@angular/material/icon'
+import { TranslateModule } from '@ngx-translate/core'
+import { SearchFacade } from '../state/search.facade'
+import { SelectionService } from '../../../../../../libs/api/repository/src'
+import { combineLatest, firstValueFrom, Observable } from 'rxjs'
+import { CommonModule } from '@angular/common'
+import { map, take } from 'rxjs/operators'
+import { FieldSort } from '../../../../../../libs/common/domain/src/lib/model/search'
+import { SearchService } from '../utils/service/search.service'
+
+@Component({
+  selector: 'gn-ui-results-table',
+  templateUrl: './results-table.component.html',
+  styleUrls: ['./results-table.component.css'],
+  standalone: true,
+  imports: [
+    CommonModule,
+    UiInputsModule,
+    InteractiveTableComponent,
+    InteractiveTableColumnComponent,
+    MatIconModule,
+    TranslateModule,
+  ],
+})
+export class ResultsTableComponent {
+  @Output() recordClick = new EventEmitter<CatalogRecord>()
+
+  records$ = this.searchFacade.results$
+  recordCount$ = this.searchFacade.resultsHits$
+  selectedRecords$ = this.selectionService.selectedRecordsIdentifiers$
+
+  constructor(
+    private searchFacade: SearchFacade,
+    private searchService: SearchService,
+    private selectionService: SelectionService
+  ) {}
+
+  dateToString(date: Date): string {
+    return date?.toLocaleDateString(undefined, {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+      timeZone: 'UTC',
+    })
+  }
+
+  getStatus(isPublishedToAll: boolean | unknown) {
+    return isPublishedToAll ? 'published' : 'not published'
+  }
+
+  getRecordFormats(record: CatalogRecord): FileFormat[] {
+    if (record.kind === 'service' || !('distributions' in record)) {
+      return []
+    }
+    const formats = Array.from(
+      new Set(
+        record.distributions.map((distribution) => getFileFormat(distribution))
+      )
+    ).filter((format) => !!format)
+    formats.sort((a, b) => getFormatPriority(b) - getFormatPriority(a))
+    return formats
+  }
+
+  formatUserInfo(userInfo: string | unknown): string {
+    const infos = (typeof userInfo === 'string' ? userInfo : '').split('|')
+    if (infos && infos.length === 4) {
+      return `${infos[2]} ${infos[1]}`
+    }
+    return undefined
+  }
+
+  getBadgeColor(format: FileFormat): string {
+    return getBadgeColor(format)
+  }
+
+  handleRecordClick(item: unknown) {
+    this.recordClick.emit(item as CatalogRecord)
+  }
+
+  setSortBy(col: string, order: 'asc' | 'desc') {
+    this.searchService.setSortBy([order, col])
+  }
+
+  isSortedBy(col: string): Observable<'asc' | 'desc' | null> {
+    return this.searchFacade.sortBy$.pipe(
+      take(1),
+      map((sortOrder) => {
+        const sortArray = Array.isArray(sortOrder[0])
+          ? (sortOrder as FieldSort[])
+          : ([sortOrder] as FieldSort[])
+        for (const sort of sortArray) {
+          if (sort[1] === col) {
+            return sort[0]
+          }
+        }
+        return null
+      })
+    )
+  }
+
+  isChecked(record: CatalogRecord): Observable<boolean> {
+    return this.selectedRecords$.pipe(
+      take(1),
+      map((selectedRecords) => {
+        return selectedRecords.includes(record.uniqueIdentifier)
+      })
+    )
+  }
+
+  handleRecordSelectedChange(selected: boolean, record: CatalogRecord) {
+    if (!selected) {
+      this.selectionService.deselectRecords([record])
+    } else {
+      this.selectionService.selectRecords([record])
+    }
+  }
+
+  async toggleSelectAll() {
+    const records = await firstValueFrom(this.records$)
+    if (await firstValueFrom(this.isAllSelected())) {
+      this.selectionService.deselectRecords(records)
+    } else {
+      this.selectionService.selectRecords(records)
+    }
+  }
+
+  isAllSelected(): Observable<boolean> {
+    return combineLatest([this.records$, this.selectedRecords$]).pipe(
+      take(1),
+      map(([records, selectedRecords]) => {
+        return records.every((record) =>
+          selectedRecords.includes(record.uniqueIdentifier)
+        )
+      })
+    )
+  }
+
+  isSomeSelected(): Observable<boolean> {
+    return combineLatest([this.records$, this.selectedRecords$]).pipe(
+      take(1),
+      map(([records, selectedRecords]) => {
+        const allSelected = records.every((record) =>
+          selectedRecords.includes(record.uniqueIdentifier)
+        )
+        const someSelected = records.some((record) =>
+          selectedRecords.includes(record.uniqueIdentifier)
+        )
+        return !allSelected && someSelected
+      })
+    )
+  }
+}

package/src/libs/feature/search/src/lib/state/effects.ts

@@ -126,10 +126,11 @@ export class SearchEffects {
           ),
           switchMap(([state, favorites]) => {
             if (!state.params.useSpatialFilter || !this.filterGeometry$) {
-              return of([state, favorites, null])
+              return of([state, favorites, undefined])
             }
             return this.filterGeometry$.pipe(
               tap((geom) => {
+                if (!geom) return
                 try {
                   const trace = validGeoJson(geom, true) as string[]
                   if (trace?.length > 0) {
@@ -145,7 +146,7 @@ export class SearchEffects {
               }),
               map((geom) => [state, favorites, geom]),
               catchError((e) => {
-                return of([state, favorites, null])
+                return of([state, favorites, undefined])
               })
             )
           }),
@@ -153,7 +154,7 @@ export class SearchEffects {
             ([state, favorites, geometry]: [
               SearchStateSearch,
               string[],
-              Geometry | null
+              Geometry | undefined
             ]) => {
               const { currentPage, pageSize, sort } = state.params
               const filters = {

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

@@ -18,5 +18,7 @@ export * from './lib/pagination/pagination.component'
 export * from './lib/related-record-card/related-record-card.component'
 export * from './lib/search-results-error/search-results-error.component'
 export * from './lib/user-preview/user-preview.component'
+export * from './lib/max-lines/max-lines.component'
 export * from './lib/record-api-form/record-api-form.component'
 export * from './lib/markdown-parser/markdown-parser.component'
+export * from './lib/image-overlay-preview/image-overlay-preview.component'

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.html

@@ -8,7 +8,10 @@
   >
     record.metadata.download
   </p>
-  <div class="flex flex-wrap justify-start sm:justify-end sm:pb-4">
+  <div
+    class="flex flex-wrap justify-start sm:justify-end sm:pb-4"
+    data-cy="download-format-filters"
+  >
     <gn-ui-button
       class="m-1 format-filter"
       [extraClass]="

package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.html

@@ -0,0 +1,30 @@
+<gn-ui-content-ghost
+  [showContent]="imageUrl !== undefined"
+  ghostClass="h-48 mb-3"
+>
+  <div
+    *ngIf="imageUrl"
+    [showContent]="imageUrl !== undefined"
+    data-cy="record-thumbnail"
+    class="flex-shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 group-hover:shadow-xl group-hover:border-0 h-48 mb-3"
+  >
+    <gn-ui-thumbnail
+      class="relative h-full w-full"
+      [thumbnailUrl]="imageUrl"
+      fit="cover"
+      (placeholderShown)="isPlaceholderShown.emit($event)"
+    ></gn-ui-thumbnail>
+    <div class="relative">
+      <gn-ui-button
+        class="absolute bottom-0 right-0 z-10 mr-2 mb-2"
+        [type]="'outline'"
+        [extraClass]="'!py-2 !px-0'"
+        (buttonClick)="openLightbox(imageUrl)"
+      >
+        <mat-icon class="material-symbols-outlined font-extralight"
+          >zoom_out_map</mat-icon
+        >
+      </gn-ui-button>
+    </div>
+  </div>
+</gn-ui-content-ghost>

package/src/libs/ui/elements/src/lib/image-overlay-preview/image-overlay-preview.component.ts

@@ -0,0 +1,15 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core'
+import * as basicLightbox from 'basiclightbox'
+
+@Component({
+  selector: 'gn-ui-image-overlay-preview',
+  templateUrl: './image-overlay-preview.component.html',
+  styleUrls: ['./image-overlay-preview.component.css'],
+})
+export class ImageOverlayPreviewComponent {
+  @Input() imageUrl: string
+  @Output() isPlaceholderShown = new EventEmitter<boolean>()
+  openLightbox(src: string) {
+    basicLightbox.create(`<img src="${src}"/>`).show()
+  }
+}