geonetwork-ui 2.2.0-dev.f866474c → 2.3.0-dev.139106e0

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/catalog/src/lib/organisation-preview/organisation-preview.component.html

@@ -4,7 +4,7 @@
     [title]="organisation.name"
   >
     <div
-      class="flex-shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36"
+      class="shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36"
     >
       <gn-ui-thumbnail
         class="relative h-full w-full"
@@ -13,20 +13,20 @@
       >
       </gn-ui-thumbnail>
     </div>
-    <div class="px-3 pb-2 capitalize flex flex-col flex-grow overflow-hidden">
+    <div class="px-3 pb-2 capitalize flex flex-col grow overflow-hidden">
       <span
-        class="flex-shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2 transition-colors"
+        class="shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2 transition-colors"
         data-cy="organizationName"
       >
         {{ organisation.name }}</span
       >
       <p
-        class="abstract mt-4 mb-5 sm:mb-2 sm:mt-0 flex-grow flex-shrink-1 overflow-hidden"
+        class="abstract mt-4 mb-5 sm:mb-2 sm:mt-0 grow shrink-1 overflow-hidden"
         data-cy="organizationDesc"
       >
         {{ organisation.description }}
       </p>
-      <div class="flex-shrink-0 text-primary opacity-50 flex leading-6">
+      <div class="shrink-0 text-primary opacity-50 flex leading-6">
         <mat-icon class="material-symbols-outlined text-primary opacity-50 mr-1"
           >folder_open
         </mat-icon>

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

@@ -1,21 +1,24 @@
-export * from './lib/ui-elements.module'
-export * from './lib/metadata-info/metadata-info.component'
-export * from './lib/metadata-contact/metadata-contact.component'
-export * from './lib/metadata-catalog/metadata-catalog.component'
-export * from './lib/metadata-quality/metadata-quality.component'
-export * from './lib/metadata-quality-item/metadata-quality-item.component'
-export * from './lib/search-results-error/search-results-error.component'
-export * from './lib/thumbnail/thumbnail.component'
-export * from './lib/content-ghost/content-ghost.component'
-export * from './lib/pagination-buttons/pagination-buttons.component'
 export * from './lib/api-card/api-card.component'
 export * from './lib/avatar/avatar.component'
 export * from './lib/content-ghost/content-ghost.component'
 export * from './lib/download-item/download-item.component'
 export * from './lib/downloads-list/downloads-list.component'
+export * from './lib/image-overlay-preview/image-overlay-preview.component'
 export * from './lib/link-card/link-card.component'
+export * from './lib/markdown-editor/markdown-editor.component'
+export * from './lib/markdown-parser/markdown-parser.component'
+export * from './lib/max-lines/max-lines.component'
+export * from './lib/metadata-catalog/metadata-catalog.component'
+export * from './lib/metadata-contact/metadata-contact.component'
+export * from './lib/metadata-info/metadata-info.component'
+export * from './lib/metadata-quality-item/metadata-quality-item.component'
+export * from './lib/metadata-quality/metadata-quality.component'
+export * from './lib/pagination-buttons/pagination-buttons.component'
 export * from './lib/pagination/pagination.component'
+export * from './lib/record-api-form/record-api-form.component'
 export * from './lib/related-record-card/related-record-card.component'
 export * from './lib/search-results-error/search-results-error.component'
+export * from './lib/thumbnail/thumbnail.component'
+export * from './lib/ui-elements.module'
 export * from './lib/user-preview/user-preview.component'
-export * from './lib/record-api-form/record-api-form.component'
+export * from './lib/notification/notification.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="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.html

@@ -0,0 +1,18 @@
+<div class="h-full flex flex-col">
+  <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,45 @@
+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() preview = false
+  @Input() helperText?: string
+  @Input() placeholder: string
+  @Input() textContent: string
+  @Output() textContentChanged: EventEmitter<string> =
+    new EventEmitter<string>()
+
+  textContentChangedHandler(textContent: string) {
+    this.textContent = textContent
+    this.textContentChanged.emit(this.textContent)
+  }
+}

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

@@ -0,0 +1,264 @@
+/** Body **/
+:host ::ng-deep .markdown-body {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  margin: 0px 0px 1.5rem 0px;
+  line-height: 1.5;
+  word-wrap: break-word;
+}
+
+/** Emphasis **/
+
+:host ::ng-deep .markdown-body strong {
+  @apply font-bold;
+  color: var(--color-secondary-darker);
+}
+
+/** Headings **/
+
+:host ::ng-deep .markdown-body h1,
+:host ::ng-deep .markdown-body h2,
+:host ::ng-deep .markdown-body h3,
+:host ::ng-deep .markdown-body h4,
+:host ::ng-deep .markdown-body h5,
+:host ::ng-deep .markdown-body h6 {
+  margin-top: 24px;
+  margin-bottom: 16px;
+  line-height: 1.25;
+  @apply text-title font-title font-bold;
+}
+
+:host ::ng-deep .markdown-body h1 {
+  margin: 0.67em 0;
+  padding-bottom: 0.3em;
+  font-size: 2em;
+  color: var(--color-primary);
+}
+
+:host ::ng-deep .markdown-body h2 {
+  padding-bottom: 0.3em;
+  font-size: 1.5em;
+  color: var(--color-secondary);
+}
+
+:host ::ng-deep .markdown-body h3 {
+  font-size: 1.25em;
+  color: var(--color-secondary);
+}
+
+:host ::ng-deep .markdown-body h4 {
+  font-size: 1em;
+  color: var(--color-secondary);
+}
+
+:host ::ng-deep .markdown-body h5 {
+  font-size: 0.875em;
+  color: var(--color-secondary);
+}
+
+:host ::ng-deep .markdown-body h6 {
+  font-size: 0.85em;
+  color: var(--color-secondary-lighter);
+}
+
+/** Paragraphs **/
+
+:host ::ng-deep .markdown-body p {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+/** Links **/
+
+:host ::ng-deep .markdown-body p > a {
+  margin-top: 0;
+  margin-bottom: 10px;
+  color: var(--color-primary) !important;
+  text-decoration: none;
+}
+
+:host ::ng-deep .markdown-body p > a:hover {
+  color: var(--color-primary-darker) !important;
+  @apply underline;
+}
+
+/** Blockquotes **/
+
+:host ::ng-deep .markdown-body blockquote {
+  margin: 0;
+  padding: 0 1em;
+  color: var(--color-secondary-lighter);
+  border-left: 0.25em solid var(--color-primary-lighter);
+}
+
+/** Code **/
+
+:host ::ng-deep .markdown-body pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 12px;
+  background-color: var(--color-gray-100);
+  word-wrap: normal;
+}
+
+:host ::ng-deep .markdown-body pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  color: var(--color-secondary);
+  border-radius: 6px;
+}
+
+:host ::ng-deep .markdown-body code {
+  padding: 0.2em 0.4em;
+  margin: 0;
+  font-size: 85%;
+  white-space: break-spaces;
+  border-radius: 6px;
+}
+
+:host ::ng-deep .markdown-body pre code {
+  display: inline;
+  max-width: auto;
+  padding: 0;
+  margin: 0;
+  overflow: visible;
+  line-height: inherit;
+  word-wrap: normal;
+  border: 0;
+}
+
+/** Horizontal rules **/
+
+:host ::ng-deep .markdown-body hr {
+  box-sizing: content-box;
+  overflow: hidden;
+  background: transparent;
+  border-bottom: 1px solid var(--color-secondary);
+  height: 0.15em;
+  padding: 0;
+  margin: 24px 0;
+  background-color: var(--color-secondary);
+  border: 0;
+}
+
+:host ::ng-deep .markdown-body hr::before {
+  display: table;
+  content: '';
+}
+
+:host ::ng-deep .markdown-body hr::after {
+  display: table;
+  clear: both;
+  content: '';
+}
+
+/** Lists **/
+
+:host ::ng-deep .markdown-body ul,
+:host ::ng-deep .markdown-body ol {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-left: 2em;
+  list-style: revert;
+}
+
+:host ::ng-deep .markdown-body ol ol,
+:host ::ng-deep .markdown-body ul ol {
+  list-style-type: lower-roman;
+}
+
+:host ::ng-deep .markdown-body ul ul ol,
+:host ::ng-deep .markdown-body ul ol ol,
+:host ::ng-deep .markdown-body ol ul ol,
+:host ::ng-deep .markdown-body ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+:host ::ng-deep .markdown-body ol[type='a s'] {
+  list-style-type: lower-alpha;
+}
+
+:host ::ng-deep .markdown-body ol[type='A s'] {
+  list-style-type: upper-alpha;
+}
+
+:host ::ng-deep .markdown-body ol[type='i s'] {
+  list-style-type: lower-roman;
+}
+
+:host ::ng-deep .markdown-body ol[type='I s'] {
+  list-style-type: upper-roman;
+}
+
+:host ::ng-deep .markdown-body ol[type='1'] {
+  list-style: unset;
+  list-style-type: decimal;
+}
+
+:host ::ng-deep .markdown-body div > ol:not([type]) {
+  list-style: unset;
+  list-style-type: decimal;
+}
+
+/** Table **/
+
+:host ::ng-deep .markdown-body table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  display: block;
+  width: max-content;
+  max-width: 100%;
+  overflow: auto;
+  padding-bottom: 15px;
+}
+
+:host ::ng-deep .markdown-body td,
+:host ::ng-deep .markdown-body th {
+  padding: 0;
+}
+
+:host ::ng-deep .markdown-body th {
+  color: var(--color-secondary);
+}
+
+:host ::ng-deep .markdown-body table th,
+:host ::ng-deep .markdown-body table td {
+  padding: 6px 13px;
+  border: 1px solid var(--color-gray-500);
+}
+
+:host ::ng-deep .markdown-body table td > :last-child {
+  margin-bottom: 0;
+}
+
+:host ::ng-deep .markdown-body table tr {
+  background-color: #ffffff;
+  border-top: 1px solid var(--color-secondary-lighter);
+}
+
+:host ::ng-deep .markdown-body table tr:nth-child(2n) {
+  background-color: var(--color-gray-100);
+}
+
+:host ::ng-deep .markdown-body table img {
+  background-color: transparent;
+}
+
+/** Images **/
+
+:host ::ng-deep .markdown-body img {
+  border-style: none;
+  max-width: 100%;
+  box-sizing: content-box;
+  background-color: transparent;
+}
+
+:host ::ng-deep .markdown-body img[align='right'] {
+  padding-left: 20px;
+}
+
+:host ::ng-deep .markdown-body img[align='left'] {
+  padding-right: 20px;
+}

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

@@ -0,0 +1 @@
+<div class="markdown-body" [innerHTML]="parsedMarkdown"></div>

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

@@ -0,0 +1,17 @@
+import { Component, Input, ChangeDetectionStrategy } from '@angular/core'
+import { marked } from 'marked'
+
+@Component({
+  selector: 'gn-ui-markdown-parser',
+  templateUrl: './markdown-parser.component.html',
+  styleUrls: ['./markdown-parser.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+})
+export class MarkdownParserComponent {
+  @Input() textContent: string
+
+  get parsedMarkdown() {
+    return marked.parse(this.textContent)
+  }
+}

package/src/libs/ui/elements/src/lib/max-lines/max-lines.component.html

@@ -1,10 +1,14 @@
 <div
   #container
-  class="max-lines overflow-hidden transition-[max-height] duration-300"
+  class="max-lines overflow-hidden transition-[max-height] duration-300 relative"
   [ngClass]="isExpanded ? 'ease-in' : 'ease-out'"
   [style.maxHeight]="maxHeight"
 >
   <ng-content></ng-content>
+  <div
+    *ngIf="showToggleButton && !isExpanded"
+    class="absolute inset-x-0 bottom-0 bg-gradient-to-b from-transparent to-white h-3"
+  ></div>
 </div>
 <div
   *ngIf="showToggleButton"

package/src/libs/ui/elements/src/lib/max-lines/max-lines.component.ts

@@ -78,6 +78,7 @@ export class MaxLinesComponent implements AfterViewInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
+    if (!this.observer) return
     this.observer.unobserve(this.container.nativeElement.children[0])
   }
 }