geonetwork-ui 2.2.0-dev.3ee8e2c9 → 2.2.0-dev.40043f45

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

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

@@ -1,11 +1,12 @@
 <gn-ui-content-ghost
   [showContent]="imageUrl !== undefined"
-  ghostClass="h-36 mb-3"
+  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 h-36 group-hover:shadow-xl group-hover:border-0 mb-3"
+    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"

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.css

@@ -74,12 +74,12 @@
   margin-top: 0;
   margin-bottom: 10px;
   color: var(--color-primary) !important;
-  text-decoration: none !important;
-  @apply font-bold;
+  text-decoration: none;
 }
 
 :host ::ng-deep .markdown-body p > a:hover {
   color: var(--color-primary-darker) !important;
+  @apply underline;
 }
 
 /** Blockquotes **/

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/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])
   }
 }

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

@@ -1,5 +1,5 @@
-<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6 sm:mb-12">
-  <div class="grid gap-3">
+<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6">
+  <div class="grid gap-3 overflow-hidden">
     <div>
       <p class="text-sm font-medium" translate>record.metadata.contact</p>
     </div>

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

@@ -7,33 +7,144 @@
         ></gn-ui-markdown-parser>
       </div>
     </gn-ui-max-lines>
+    <div *ngIf="metadata.keywords?.length">
+      <p class="mt-6 mb-3 font-medium text-primary text-sm" translate>
+        record.metadata.keywords
+      </p>
+      <div class="sm:pb-4 flex flex-wrap gap-2">
+        <gn-ui-badge
+          class="inline-block lowercase"
+          (click)="onKeywordClick(keyword)"
+          [clickable]="true"
+          *ngFor="let keyword of metadata.keywords"
+          >{{ keyword.label }}</gn-ui-badge
+        >
+      </div>
+    </div>
   </gn-ui-content-ghost>
 </div>
 
+<gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
+  <div class="flex flex-col gap-[10px] mr-4 py-[12px] rounded text-gray-900">
+    <ng-container *ngFor="let license of licenses">
+      <div *ngIf="license.url; else noUrl" class="text-primary">
+        <a
+          [href]="license.url"
+          target="_blank"
+          class="cursor-pointer hover:underline transition-all"
+        >
+          {{ license.text }}
+          <mat-icon
+            class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
+            >open_in_new</mat-icon
+          >
+        </a>
+      </div>
+      <ng-template #noUrl>
+        <div class="text-primary" gnUiLinkify>
+          {{ license.text }}
+        </div>
+      </ng-template>
+    </ng-container>
+    <ng-container *ngIf="legalConstraints.length">
+      <gn-ui-markdown-parser
+        *ngFor="let constraint of legalConstraints"
+        [textContent]="constraint"
+      >
+      </gn-ui-markdown-parser>
+    </ng-container>
+    <ng-container *ngIf="otherConstraints.length">
+      <div gnUiLinkify *ngFor="let constraint of otherConstraints">
+        <h5 translate class="font-medium text-black text-sm mb-[2px] mt-[16px]">
+          record.metadata.otherConstraints
+        </h5>
+        <gn-ui-markdown-parser [textContent]="constraint">
+        </gn-ui-markdown-parser>
+      </div>
+    </ng-container>
+
+    <span class="noUsage" *ngIf="!hasUsage">
+      {{ 'record.metadata.noUsage' | translate }}
+    </span>
+  </div>
+</gn-ui-expandable-panel>
 <gn-ui-expandable-panel
-  class="metadata-origin"
   *ngIf="
     metadata.lineage ||
     metadata.recordUpdated ||
     metadata.updateFrequency ||
     metadata.status
   "
-  [title]="'record.metadata.origin' | translate"
+  [title]="'record.metadata.details' | translate"
 >
-  <p
-    *ngIf="metadata.lineage"
-    class="mb-5 pt-4 whitespace-pre-line break-words"
-    gnUiLinkify
-  >
-    {{ metadata.lineage }}
-  </p>
+  <div *ngIf="metadata.lineage" class="text-gray-900 flex flex-col mt-4 gap-2">
+    <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
+      *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"
+    >
+      <gn-ui-thumbnail
+        class="relative h-full w-full"
+        [thumbnailUrl]="resourceContact.organization.logoUrl.href"
+        fit="contain"
+      ></gn-ui-thumbnail>
+    </div>
+    <div class="flex flex-col gap-1">
+      <p class="text-sm font-medium" translate>record.metadata.producer</p>
+      <div
+        class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+        data-cy="organization-name"
+      >
+        {{ resourceContact.organization?.name }}
+      </div>
+      <div *ngIf="resourceContact.organization?.website">
+        <a
+          [href]="resourceContact.organization.website"
+          target="_blank"
+          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          >{{ resourceContact.organization.website }}
+          <mat-icon
+            class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75 shrink-0"
+            >open_in_new</mat-icon
+          >
+        </a>
+      </div>
+      <div class="mt-4" *ngIf="resourceContact.email">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+          >
+            mail_outline</mat-icon
+          >
+          <a
+            *ngIf="resourceContact.email"
+            [href]="'mailto:' + resourceContact.email"
+            class="text-sm hover:underline ml-2"
+            target="_blank"
+            data-cy="contact-email"
+            >{{ resourceContact?.email }}</a
+          >
+        </div>
+      </div>
+    </div>
+  </div>
   <div
-    class="py-4 px-6 rounded bg-gray-100 grid grid-cols-2 gap-y-[10px] gap-x-[20px] text-gray-700 info-grid"
+    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.recordUpdated">
-      <p class="text-sm" translate>record.metadata.updatedOn</p>
+    <div *ngIf="metadata.recordCreated">
+      <p class="text-sm" translate>record.metadata.creation</p>
       <p class="text-primary font-medium mt-1">
-        {{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}
+        {{ metadata.recordCreated.toLocaleDateString() }}
+      </p>
+    </div>
+    <div *ngIf="metadata.recordPublished">
+      <p class="text-sm" translate>record.metadata.publication</p>
+      <p class="text-primary font-medium mt-1">
+        {{ metadata.recordPublished.toLocaleDateString() }}
       </p>
     </div>
     <div *ngIf="updateFrequency">
@@ -46,34 +157,52 @@
         {{ updateFrequency }}
       </p>
     </div>
-    <div *ngIf="metadata.status">
-      <p class="text-sm" translate>record.metadata.updateStatus</p>
-      <p class="text-primary font-medium mt-1" translate>
-        domain.record.status.{{ metadata.status }}
-      </p>
+    <div *ngIf="metadata.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"
+          translate
+          *ngFor="let language of metadata.languages"
+        >
+          language.{{ language }}
+        </p>
+      </div>
+    </div>
+    <div *ngIf="temporalExtent">
+      <p class="text-sm" translate>record.metadata.temporalExtent</p>
+      <div class="flex flex-row gap-1 mb-1 text-primary font-medium">
+        <p
+          *ngIf="temporalExtent.start && temporalExtent.end"
+          translate
+          [translateParams]="{
+            start: temporalExtent.start,
+            end: temporalExtent.end
+          }"
+        >
+          record.metadata.temporalExtent.fromDateToDate
+        </p>
+        <p
+          *ngIf="temporalExtent.start && !temporalExtent.end"
+          translate
+          [translateParams]="{ start: temporalExtent.start }"
+        >
+          record.metadata.temporalExtent.sinceDate
+        </p>
+        <p
+          *ngIf="!temporalExtent.start && temporalExtent.end"
+          translate
+          [translateParams]="{ end: temporalExtent.end }"
+        >
+          record.metadata.temporalExtent.untilDate
+        </p>
+      </div>
     </div>
-  </div>
-</gn-ui-expandable-panel>
-<gn-ui-expandable-panel [title]="'record.metadata.usage' | translate">
-  <div class="py-4 px-6 rounded bg-gray-100 text-gray-700 flex flex-wrap gap-2">
-    <gn-ui-badge *ngIf="metadata.extras?.isOpenData">
-      <span translate>record.metadata.isOpenData</span>
-    </gn-ui-badge>
-    <span
-      class="text-primary font-medium"
-      *ngFor="let usage of usages"
-      gnUiLinkify
-    >
-      {{ usage }}
-    </span>
-    <span class="text-primary font-medium noUsage" *ngIf="!hasUsage">
-      {{ 'record.metadata.noUsage' | translate }}
-    </span>
   </div>
 </gn-ui-expandable-panel>
 <gn-ui-expandable-panel
   *ngIf="metadata.landingPage"
-  [title]="'record.metadata.details' | translate"
+  [title]="'record.metadata.technical' | translate"
 >
   <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
     <div *ngIf="metadata.recordUpdated">
@@ -109,25 +238,13 @@
         </p>
       </div>
     </div>
-    <div *ngIf="metadata.themes?.length">
-      <p class="text-sm mb-1" translate>record.metadata.themes</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
-        >
-      </div>
-    </div>
-    <div *ngIf="metadata.keywords?.length">
-      <p class="text-sm mb-1" translate>record.metadata.keywords</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 mb-2 lowercase"
-          (click)="onKeywordClick(keyword)"
-          [clickable]="true"
-          *ngFor="let keyword of metadata.keywords"
-          >{{ keyword }}</gn-ui-badge
+          *ngFor="let topic of metadata.topics"
+          >{{ topic }}</gn-ui-badge
         >
       </div>
     </div>