geonetwork-ui 2.2.0-dev.6695ae4d → 2.2.0-dev.723017a4

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/elements/src/lib/markdown-editor/markdown-editor.component.css

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

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

@@ -0,0 +1,39 @@
+<div class="h-full flex flex-col">
+  <div class="flex-none w-full flex flex-row items-center">
+    <p class="flex-none font-bold">{{ label }}</p>
+    <div class="flex-1 flex justify-end items-center">
+      <gn-ui-button
+        [extraClass]="getButtonExtraClass()"
+        (buttonClick)="togglePreview()"
+      >
+        <span class="material-symbols-outlined mr-1 icon-small">{{
+          preview ? 'visibility' : 'visibility_off'
+        }}</span>
+        {{ preview ? 'WYSIWYG' : 'Markdown' }}
+      </gn-ui-button>
+      <span
+        class="material-symbols-outlined m-2 icon-small"
+        [matTooltip]="tooltip"
+        matTooltipPosition="above"
+      >
+        help
+      </span>
+    </div>
+  </div>
+  <p class="flex-none mb-2 font-medium text-sm text-gray-900">
+    {{ helperText }}
+  </p>
+  <div class="flex-1" [hidden]="preview">
+    <gn-ui-text-area
+      [placeholder]="placeholder"
+      [value]="textContent"
+      (valueChange)="textContentChangedHandler($event)"
+    ></gn-ui-text-area>
+  </div>
+  <div
+    class="flex-1 border border-gray-800 rounded overflow-y-scroll"
+    [hidden]="!preview"
+  >
+    <gn-ui-markdown-parser [textContent]="textContent"></gn-ui-markdown-parser>
+  </div>
+</div>

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

@@ -0,0 +1,58 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { MarkdownParserComponent } from '../markdown-parser/markdown-parser.component'
+import { TranslateModule } from '@ngx-translate/core'
+import { ButtonComponent, TextAreaComponent } from '../../../../../../libs/ui/inputs/src'
+import { MatIconModule } from '@angular/material/icon'
+import { MatTooltipModule } from '@angular/material/tooltip'
+
+@Component({
+  selector: 'gn-ui-markdown-editor',
+  templateUrl: './markdown-editor.component.html',
+  styleUrls: ['./markdown-editor.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatIconModule,
+    MatTooltipModule,
+    ButtonComponent,
+    TextAreaComponent,
+    MarkdownParserComponent,
+    TranslateModule,
+  ],
+})
+export class MarkdownEditorComponent {
+  @Input() label: string
+  @Input() tooltip?: string
+  @Input() helperText?: string
+  @Input() placeholder: string
+  @Input() textContent: string
+  @Output() textContentChanged: EventEmitter<string> =
+    new EventEmitter<string>()
+
+  preview = false
+
+  getButtonExtraClass() {
+    return `${
+      this.preview ? 'text-gray-200 bg-gray-900' : 'text-gray-900 bg-gray-200'
+    } rounded-[1.25rem] p-[0.375rem] text-xs font-medium w-24`
+  }
+
+  togglePreview() {
+    this.preview = !this.preview
+  }
+
+  textContentChangedHandler(textContent: string) {
+    this.textContent = textContent
+    this.textContentChanged.emit(this.textContent)
+  }
+}

package/src/libs/ui/elements/src/lib/markdown-parser/markdown-parser.component.ts

@@ -6,6 +6,7 @@ import { marked } from 'marked'
   templateUrl: './markdown-parser.component.html',
   styleUrls: ['./markdown-parser.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class MarkdownParserComponent {
   @Input() textContent: string

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

@@ -136,13 +136,13 @@
         </p>
       </div>
     </div>
-    <div *ngIf="metadata.themes?.length">
-      <p class="text-sm mb-1" translate>record.metadata.themes</p>
+    <div *ngIf="metadata.topics?.length">
+      <p class="text-sm mb-1" translate>record.metadata.topics</p>
       <div class="sm:pb-4 sm:pr-16">
         <gn-ui-badge
           class="inline-block mr-2 lowercase"
-          *ngFor="let theme of metadata.themes"
-          >{{ theme }}</gn-ui-badge
+          *ngFor="let topic of metadata.topics"
+          >{{ topic }}</gn-ui-badge
         >
       </div>
     </div>
@@ -154,7 +154,7 @@
           (click)="onKeywordClick(keyword)"
           [clickable]="true"
           *ngFor="let keyword of metadata.keywords"
-          >{{ keyword }}</gn-ui-badge
+          >{{ keyword.label }}</gn-ui-badge
         >
       </div>
     </div>

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

@@ -5,7 +5,10 @@ import {
   Input,
   Output,
 } from '@angular/core'
-import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import {
+  DatasetRecord,
+  Keyword,
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-metadata-info',
@@ -16,7 +19,7 @@ import { DatasetRecord } from '../../../../../../libs/common/domain/src/lib/mode
 export class MetadataInfoComponent {
   @Input() metadata: Partial<DatasetRecord>
   @Input() incomplete: boolean
-  @Output() keyword = new EventEmitter<string>()
+  @Output() keyword = new EventEmitter<Keyword>()
   updatedTimes: number
 
   get hasUsage() {
@@ -77,7 +80,7 @@ export class MetadataInfoComponent {
     return !this.incomplete || propName in this.metadata
   }
 
-  onKeywordClick(keyword: string) {
+  onKeywordClick(keyword: Keyword) {
     this.keyword.emit(keyword)
   }
 }

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

@@ -32,8 +32,7 @@ export class MetadataQualityComponent implements OnChanges {
 
   get calculatedQualityScore(): number {
     return Math.round(
-      (this.items.filter(({ value }) => value === true).length * 100) /
-        this.items.length
+      (this.items.filter(({ value }) => value).length * 100) / this.items.length
     )
   }
 
@@ -56,7 +55,7 @@ export class MetadataQualityComponent implements OnChanges {
     this.items = []
     this.add('title', !!this.metadata?.title)
     this.add('description', !!this.metadata?.abstract)
-    this.add('topic', this.metadata?.themes?.length > 0)
+    this.add('topic', this.metadata?.topics?.length > 0)
     this.add('keywords', this.metadata?.keywords?.length > 0)
     this.add('legalConstraints', this.metadata?.legalConstraints?.length > 0)
     this.add('organisation', !!contact?.organization)

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

@@ -45,6 +45,7 @@ import { ImageOverlayPreviewComponent } from './image-overlay-preview/image-over
     UiInputsModule,
     FormsModule,
     NgOptimizedImage,
+    MarkdownParserComponent,
   ],
   declarations: [
     MetadataInfoComponent,
@@ -67,7 +68,6 @@ import { ImageOverlayPreviewComponent } from './image-overlay-preview/image-over
     PaginationButtonsComponent,
     MaxLinesComponent,
     RecordApiFormComponent,
-    MarkdownParserComponent,
     ImageOverlayPreviewComponent,
   ],
   exports: [

package/src/libs/ui/inputs/src/lib/button/button.component.ts

@@ -12,6 +12,7 @@ import { propagateToDocumentOnly } from '../../../../../../libs/util/shared/src'
   templateUrl: './button.component.html',
   styleUrls: ['./button.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class ButtonComponent {
   private btnClass: string

package/src/libs/ui/inputs/src/lib/text-area/text-area.component.ts

@@ -12,6 +12,7 @@ import { distinctUntilChanged } from 'rxjs/operators'
   selector: 'gn-ui-text-area',
   templateUrl: './text-area.component.html',
   styleUrls: ['./text-area.component.css'],
+  standalone: true,
 })
 export class TextAreaComponent implements AfterViewInit {
   @Input() value = ''

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

@@ -47,10 +47,8 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
   declarations: [
     DropdownSelectorComponent,
     AutocompleteComponent,
-    ButtonComponent,
     TextInputComponent,
     DragAndDropFileInputComponent,
-    TextAreaComponent,
     ChipsInputComponent,
     NavigationButtonComponent,
     StarToggleComponent,
@@ -89,6 +87,8 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
     MatDatepickerModule,
     MatNativeDateModule,
     EditableLabelDirective,
+    TextAreaComponent,
+    ButtonComponent,
   ],
   exports: [
     DropdownSelectorComponent,

package/translations/de.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "Ähnliche Datensätze",
   "record.metadata.sheet": "Weitere Informationen verfügbar unter:",
   "record.metadata.status": "",
-  "record.metadata.themes": "Kategorien",
   "record.metadata.title": "Titel",
+  "record.metadata.topics": "Kategorien",
   "record.metadata.type": "Geographischer Datensatz",
   "record.metadata.uniqueId": "Eindeutige Kennung",
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "Ist räumliche Daten",
   "search.filters.isSpatial.no": "nicht räumlich",
   "search.filters.isSpatial.yes": "räumlich",
+  "search.filters.keyword": "Schlüsselwort",
   "search.filters.license": "Lizenz",
   "search.filters.license.cc-by": "Creative Commons CC-BY",
   "search.filters.license.cc-by-sa": "Creative Commons CC-BY-SA",

package/translations/en.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "Related records",
   "record.metadata.sheet": "Original metadata",
   "record.metadata.status": "Status",
-  "record.metadata.themes": "Categories",
   "record.metadata.title": "Title",
+  "record.metadata.topics": "Categories",
   "record.metadata.type": "Geographical dataset",
   "record.metadata.uniqueId": "Unique Identifier",
   "record.metadata.updateFrequency": "Data Update Frequency",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "Is spatial data",
   "search.filters.isSpatial.no": "non spatial",
   "search.filters.isSpatial.yes": "spatial",
+  "search.filters.keyword": "Keyword",
   "search.filters.license": "License",
   "search.filters.license.cc-by": "Creative Commons CC-BY",
   "search.filters.license.cc-by-sa": "Creative Commons CC-BY-SA",

package/translations/es.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
-  "record.metadata.themes": "",
   "record.metadata.title": "",
+  "record.metadata.topics": "",
   "record.metadata.type": "",
   "record.metadata.uniqueId": "",
   "record.metadata.updateFrequency": "",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "",
   "search.filters.isSpatial.no": "",
   "search.filters.isSpatial.yes": "",
+  "search.filters.keyword": "",
   "search.filters.license": "",
   "search.filters.license.cc-by": "",
   "search.filters.license.cc-by-sa": "",

package/translations/fr.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "Voir aussi",
   "record.metadata.sheet": "Fiche de métadonnées d'origine",
   "record.metadata.status": "",
-  "record.metadata.themes": "Catégories",
   "record.metadata.title": "Titre",
+  "record.metadata.topics": "Catégories",
   "record.metadata.type": "Donnée géographique",
   "record.metadata.uniqueId": "Identificateur de ressource unique",
   "record.metadata.updateFrequency": "Fréquence de mise à jour des données",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "Données spatiales",
   "search.filters.isSpatial.no": "non-géolocalisées",
   "search.filters.isSpatial.yes": "géolocalisées",
+  "search.filters.keyword": "Mot-clé",
   "search.filters.license": "Licence",
   "search.filters.license.cc-by": "cc-by",
   "search.filters.license.cc-by-sa": "cc-by-sa",

package/translations/it.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "Vedi anche",
   "record.metadata.sheet": "Origine del metadata",
   "record.metadata.status": "",
-  "record.metadata.themes": "Categorie",
   "record.metadata.title": "Titolo",
+  "record.metadata.topics": "Categorie",
   "record.metadata.type": "Dati geografici",
   "record.metadata.uniqueId": "Identificatore unico di risorsa",
   "record.metadata.updateFrequency": "Frequenza di aggiornamento dei dati",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "Dati spaziali",
   "search.filters.isSpatial.no": "Non geolocalizzati",
   "search.filters.isSpatial.yes": "Geolocalizzati",
+  "search.filters.keyword": "Parola chiave",
   "search.filters.license": "Licenza",
   "search.filters.license.cc-by": "cc-by",
   "search.filters.license.cc-by-sa": "cc-by-sa",

package/translations/nl.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
-  "record.metadata.themes": "",
   "record.metadata.title": "",
+  "record.metadata.topics": "",
   "record.metadata.type": "",
   "record.metadata.uniqueId": "",
   "record.metadata.updateFrequency": "",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "",
   "search.filters.isSpatial.no": "",
   "search.filters.isSpatial.yes": "",
+  "search.filters.keyword": "",
   "search.filters.license": "",
   "search.filters.license.cc-by": "",
   "search.filters.license.cc-by-sa": "",

package/translations/pt.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "",
   "record.metadata.sheet": "",
   "record.metadata.status": "",
-  "record.metadata.themes": "",
   "record.metadata.title": "",
+  "record.metadata.topics": "",
   "record.metadata.type": "",
   "record.metadata.uniqueId": "",
   "record.metadata.updateFrequency": "",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "",
   "search.filters.isSpatial.no": "",
   "search.filters.isSpatial.yes": "",
+  "search.filters.keyword": "",
   "search.filters.license": "",
   "search.filters.license.cc-by": "",
   "search.filters.license.cc-by-sa": "",

package/translations/sk.json

@@ -255,8 +255,8 @@
   "record.metadata.related": "Súvisiace záznamy",
   "record.metadata.sheet": "Ďalšie metadáta sú k dispozícii na:",
   "record.metadata.status": "",
-  "record.metadata.themes": "",
   "record.metadata.title": "Názov",
+  "record.metadata.topics": "",
   "record.metadata.type": "",
   "record.metadata.uniqueId": "",
   "record.metadata.updateFrequency": "Frekvencia aktualizácie metadát",
@@ -292,6 +292,7 @@
   "search.filters.isSpatial": "Je priestorový údaj",
   "search.filters.isSpatial.no": "nepravdivé",
   "search.filters.isSpatial.yes": "pravdivé",
+  "search.filters.keyword": "Kľúčové slová",
   "search.filters.license": "Licencia",
   "search.filters.license.cc-by": "Creative Commons CC-BY",
   "search.filters.license.cc-by-sa": "Creative Commons CC-BY-SA",