geonetwork-ui 2.2.0-dev.f866474c → 2.3.0-dev.179fba83

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

@@ -0,0 +1,112 @@
+<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>

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

@@ -0,0 +1,164 @@
+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$
+  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

@@ -41,7 +41,7 @@ import { getSearchStateSearch } from './selectors'
 import { HttpErrorResponse } from '@angular/common/http'
 import { switchMapWithSearchId } from '../utils/operators/search.operator'
 import { Geometry } from 'geojson'
-import { FILTER_GEOMETRY } from '../feature-search.module'
+import { FILTER_GEOMETRY } from '../filter-geometry.token'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { FavoritesService } from '../../../../../../libs/api/repository/src'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
@@ -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/feature/search/src/lib/state/search.facade.ts

@@ -40,7 +40,7 @@ import {
   isEndOfResults,
   totalPages,
 } from './selectors'
-import { FILTER_GEOMETRY } from '../feature-search.module'
+import { FILTER_GEOMETRY } from '../filter-geometry.token'
 import { Geometry } from 'geojson'
 import { catchError, map, shareReplay } from 'rxjs/operators'
 import {
@@ -215,5 +215,6 @@ export class SearchFacade {
     this.store.dispatch(new SetFilters({}, this.searchId))
     this.store.dispatch(new SetSortBy([], this.searchId))
     this.store.dispatch(new SetFavoritesOnly(false, this.searchId))
+    return this
   }
 }

package/src/libs/feature/search/src/lib/utils/service/fields.service.ts

@@ -4,12 +4,12 @@ import {
   FieldValue,
   FullTextSearchField,
   IsSpatialSearchField,
-  KeySearchField,
   LicenseSearchField,
+  MultilingualSearchField,
   OrganizationSearchField,
   OwnerSearchField,
   SimpleSearchField,
-  ThesaurusField,
+  TranslatedSearchField,
 } from './fields'
 import { forkJoin, Observable, of } from 'rxjs'
 import { map } from 'rxjs/operators'
@@ -21,6 +21,7 @@ export type FieldValues = Record<string, FieldValue[] | FieldValue>
 
 marker('search.filters.format')
 marker('search.filters.inspireKeyword')
+marker('search.filters.keyword')
 marker('search.filters.isSpatial')
 marker('search.filters.license')
 marker('search.filters.publicationYear')
@@ -37,29 +38,33 @@ marker('search.filters.contact')
 export class FieldsService {
   private fields = {
     publisher: new OrganizationSearchField(this.injector),
-    format: new SimpleSearchField('format', 'asc', this.injector),
-    resourceType: new KeySearchField('resourceType', 'asc', this.injector),
-    representationType: new KeySearchField(
+    format: new SimpleSearchField('format', this.injector, 'asc'),
+    resourceType: new TranslatedSearchField(
+      'resourceType',
+      this.injector,
+      'asc'
+    ),
+    representationType: new TranslatedSearchField(
       'cl_spatialRepresentationType.key',
-      'asc',
-      this.injector
+      this.injector,
+      'asc'
     ),
     publicationYear: new SimpleSearchField(
       'publicationYearForResource',
-      'desc',
-      this.injector
+      this.injector,
+      'desc'
     ),
-    topic: new KeySearchField('cl_topic.key', 'asc', this.injector),
-    inspireKeyword: new ThesaurusField(
+    topic: new TranslatedSearchField('cl_topic.key', this.injector, 'asc'),
+    inspireKeyword: new TranslatedSearchField(
       'th_httpinspireeceuropaeutheme-theme.link',
-      'external.theme.httpinspireeceuropaeutheme-theme',
-      'asc',
-      this.injector
+      this.injector,
+      'asc'
     ),
+    keyword: new MultilingualSearchField('tag', this.injector, 'desc', 'count'),
     documentStandard: new SimpleSearchField(
       'documentStandard',
-      'asc',
-      this.injector
+      this.injector,
+      'asc'
     ),
     isSpatial: new IsSpatialSearchField(this.injector),
     q: new FullTextSearchField(),

package/src/libs/feature/search/src/lib/utils/service/fields.ts

@@ -1,5 +1,5 @@
-import { firstValueFrom, Observable, of, switchMap, tap } from 'rxjs'
-import { catchError, map, shareReplay } from 'rxjs/operators'
+import { firstValueFrom, Observable, of, switchMap } from 'rxjs'
+import { map } from 'rxjs/operators'
 import { Injector } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
@@ -13,7 +13,10 @@ import {
   FieldFilters,
   TermBucket,
 } from '../../../../../../../libs/common/domain/src/lib/model/search'
-import { ElasticsearchService } from '../../../../../../../libs/api/repository/src'
+import {
+  ElasticsearchService,
+  METADATA_LANGUAGE,
+} from '../../../../../../../libs/api/repository/src'
 import { LangService } from '../../../../../../../libs/util/i18n/src'
 
 export type FieldValue = string | number
@@ -36,8 +39,9 @@ export class SimpleSearchField implements AbstractSearchField {
 
   constructor(
     protected esFieldName: string,
+    protected injector: Injector,
     protected order: 'asc' | 'desc' = 'asc',
-    protected injector: Injector
+    protected orderType: 'key' | 'count' = 'key'
   ) {}
 
   protected getAggregations(): AggregationsParams {
@@ -46,13 +50,13 @@ export class SimpleSearchField implements AbstractSearchField {
         type: 'terms',
         field: this.esFieldName,
         limit: 1000,
-        sort: [this.order, 'key'],
+        sort: [this.order, this.orderType],
       },
     }
   }
 
   protected async getBucketLabel(bucket: TermBucket): Promise<string> {
-    return bucket.term as string
+    return bucket.term.toString()
   }
 
   getAvailableValues(): Observable<FieldAvailableValue[]> {
@@ -88,9 +92,18 @@ export class SimpleSearchField implements AbstractSearchField {
   }
 }
 
-export class KeySearchField extends SimpleSearchField {
+export class TranslatedSearchField extends SimpleSearchField {
   protected platformService = this.injector.get(PlatformServiceInterface)
 
+  constructor(
+    protected esFieldName: string,
+    protected injector: Injector,
+    protected order: 'asc' | 'desc' = 'asc',
+    protected orderType: 'key' | 'count' = 'key'
+  ) {
+    super(esFieldName, injector, order, orderType)
+  }
+
   protected async getTranslation(key: string) {
     return firstValueFrom(this.platformService.translateKey(key))
   }
@@ -100,6 +113,7 @@ export class KeySearchField extends SimpleSearchField {
   }
 
   getAvailableValues(): Observable<FieldAvailableValue[]> {
+    if (this.orderType === 'count') return super.getAvailableValues()
     // sort values by alphabetical order
     return super
       .getAvailableValues()
@@ -111,34 +125,29 @@ export class KeySearchField extends SimpleSearchField {
   }
 }
 
-export class ThesaurusField extends KeySearchField {
+/**
+ * This search field will either target the `.default` field, or a specific `.langxyz` field according
+ * to the defined METADATA_LANGUAGE token
+ * The provided ES field name should not include any prefix such as `.langeng`
+ */
+export class MultilingualSearchField extends SimpleSearchField {
   private langService = this.injector.get(LangService)
-  private thesaurus$ = this.platformService
-    .getThesaurusByLang(this.thesaurusName, this.langService.iso3)
-    .pipe(
-      catchError(() => {
-        console.warn('Error while loading thesaurus language package')
-        return of([])
-      }),
-      shareReplay(1)
-    )
+  private searchLanguage = this.injector.get(METADATA_LANGUAGE, null)
 
   constructor(
-    esFieldName: string,
-    protected thesaurusName: string,
-    order: 'asc' | 'desc' = 'asc',
-    injector: Injector
+    protected esFieldName: string,
+    protected injector: Injector,
+    protected order: 'asc' | 'desc' = 'asc',
+    protected orderType: 'key' | 'count' = 'key'
   ) {
-    super(esFieldName, order, injector)
-  }
-  protected async getTranslation(key: string) {
-    return firstValueFrom(
-      this.thesaurus$.pipe(
-        map(
-          (thesaurus) => thesaurus.find((keyword) => keyword.key === key)?.label
-        )
-      )
-    )
+    super(esFieldName, injector, order, orderType)
+    // note: we're excluding the metadata language "current" value because that would produce
+    // permalinks that might not work for different users
+    if (this.searchLanguage && this.searchLanguage !== 'current') {
+      this.esFieldName += `.lang${this.searchLanguage}`
+    } else {
+      this.esFieldName += '.default'
+    }
   }
 }
 
@@ -163,7 +172,7 @@ export class IsSpatialSearchField extends SimpleSearchField {
   private translateService = this.injector.get(TranslateService)
 
   constructor(injector: Injector) {
-    super('isSpatial', 'asc', injector)
+    super('isSpatial', injector, 'asc')
     this.esService.registerRuntimeField(
       'isSpatial',
       `String result = 'no';
@@ -223,7 +232,7 @@ export class LicenseSearchField extends SimpleSearchField {
   private translateService = this.injector.get(TranslateService)
 
   constructor(injector: Injector) {
-    super('license', 'asc', injector)
+    super('license', injector, 'asc')
     this.esService.registerRuntimeField(
       'license',
       `String raw = '';
@@ -330,7 +339,7 @@ export class OrganizationSearchField implements AbstractSearchField {
 }
 export class OwnerSearchField extends SimpleSearchField {
   constructor(injector: Injector) {
-    super('owner', 'asc', injector)
+    super('owner', injector, 'asc')
   }
 
   getAvailableValues(): Observable<FieldAvailableValue[]> {

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html

@@ -5,5 +5,6 @@
   [selected]="currentLang"
   ariaName="languages"
   [showTitle]="false"
+  extraBtnClass="bg-transparent flex justify-items-center !pl-2 !py-1"
 >
 </gn-ui-dropdown-selector>

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.ts

@@ -34,7 +34,7 @@ export class LanguageSwitcherComponent implements OnInit {
   ngOnInit(): void {
     const languages = this.languagePlaceholder || DEFAULT_LANGUAGES
     this.languageList = languages.map((language) => ({
-      label: `language.${language}`,
+      label: `${language}`.toUpperCase(),
       value: language,
     }))
   }

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

@@ -18,4 +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()
+  }
+}

package/src/libs/ui/elements/src/lib/markdown-editor/markdown-editor.component.css

@@ -0,0 +1,5 @@
+.icon-small {
+  font-size: 16px;
+  height: 16px;
+  width: 16px;
+}