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

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>
@@ -20,7 +20,7 @@
           (click)="onOrganizationClick()"
           data-cy="organization-name"
         >
-          {{ shownOrganization.name }}
+          {{ shownOrganization?.name }}
         </div>
       </div>
       <div *ngIf="shownOrganization?.website">

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

@@ -7,3 +7,7 @@
   padding-bottom: 10px;
   @apply border-b border-gray-300;
 }
+
+:host ::ng-deep gn-ui-copy-text-button button mat-icon {
+  transform: scale(0.8);
+}

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

@@ -1,61 +1,150 @@
-<p
-  class="text-[28px] text-title text-center mb-6 font-title sm:text-left"
-  translate
->
-  record.metadata.about
-</p>
 <div class="mb-6 md-description sm:mb-4 sm:pr-16">
   <gn-ui-content-ghost ghostClass="h-32" [showContent]="fieldReady('abstract')">
     <gn-ui-max-lines [maxLines]="6" *ngIf="metadata.abstract">
       <div>
-        <p
-          class="whitespace-pre-line break-words sm:mb-4 sm:pr-16"
-          [innerHTML]="metadata.abstract"
-          gnUiLinkify
-        ></p>
-        <ng-container *ngIf="metadata.keywords?.length">
-          <p class="mb-3 font-medium text-primary text-sm" translate>
-            record.metadata.keywords
-          </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
-            >
-          </div>
-        </ng-container>
+        <gn-ui-markdown-parser
+          [textContent]="metadata.abstract"
+        ></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">
@@ -68,41 +157,96 @@
         {{ 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="py-5 px-5 rounded bg-gray-100 text-gray-700">
-    <p class="text-sm" translate>record.metadata.sheet</p>
-    <p class="text-primary font-medium mt-1" translate>
-      <a [href]="metadata.landingPage" target="_blank">
-        <span class="break-all" gnUiLinkify>{{ metadata.landingPage }}</span>
-      </a>
-    </p>
+  <div class="flex flex-col gap-4 mr-4 py-5 rounded text-gray-700">
+    <div *ngIf="metadata.recordUpdated">
+      <p class="text-sm" translate>record.metadata.updatedOn</p>
+      <p class="text-primary font-medium">
+        {{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}
+      </p>
+    </div>
+    <div *ngIf="metadata.landingPage">
+      <p class="text-sm" translate>record.metadata.sheet</p>
+      <p class="text-primary font-medium" translate>
+        <a [href]="metadata.landingPage" target="_blank">
+          <span class="break-all" gnUiLinkify>{{ metadata.landingPage }}</span>
+        </a>
+      </p>
+    </div>
+    <div *ngIf="metadata.ownerOrganization">
+      <p class="text-sm" translate>record.metadata.owner</p>
+      <p class="text-primary font-medium">
+        {{ metadata.ownerOrganization.name }}
+      </p>
+    </div>
+    <div *ngIf="metadata.uniqueIdentifier">
+      <p class="text-sm" translate>record.metadata.uniqueId</p>
+      <div class="flex flex-row content-align items-end gap-1">
+        <gn-ui-copy-text-button
+          [text]="metadata.uniqueIdentifier"
+          [tooltipText]="'tooltip.id.copy' | translate"
+          [displayText]="false"
+        ></gn-ui-copy-text-button>
+        <p class="text-primary font-medium">
+          {{ metadata.uniqueIdentifier }}
+        </p>
+      </div>
+    </div>
+    <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"
+          *ngFor="let topic of metadata.topics"
+          >{{ topic }}</gn-ui-badge
+        >
+      </div>
+    </div>
   </div>
 </gn-ui-expandable-panel>

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

@@ -5,7 +5,11 @@ 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'
+import { getTemporalRangeUnion } from '../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-metadata-info',
@@ -16,24 +20,48 @@ 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() {
     return (
       this.metadata.extras?.isOpenData === true ||
-      this.metadata.useLimitations?.length ||
-      this.metadata.accessConstraints?.length
+      (this.metadata.legalConstraints?.length > 0 &&
+        this.legalConstraints.length > 0) ||
+      (this.metadata.otherConstraints?.length > 0 &&
+        this.otherConstraints.length > 0) ||
+      (this.metadata.licenses?.length > 0 && this.licenses.length > 0)
     )
   }
 
-  get usages(): string[] {
+  get legalConstraints() {
+    let array = []
+    if (this.metadata.legalConstraints?.length) {
+      array = array.concat(
+        this.metadata.legalConstraints.filter((c) => c.text).map((c) => c.text)
+      )
+    }
+    return array
+  }
+
+  get otherConstraints() {
     let array = []
-    if (this.metadata.useLimitations?.length) {
-      array = array.concat(this.metadata.useLimitations)
+    if (this.metadata.otherConstraints?.length) {
+      array = array.concat(
+        this.metadata.otherConstraints.filter((c) => c.text).map((c) => c.text)
+      )
     }
-    if (this.metadata.accessConstraints?.length) {
-      array = array.concat(this.metadata.accessConstraints.map((c) => c.text))
+    return array
+  }
+
+  get licenses(): { text: string; url: string }[] {
+    let array = []
+    if (this.metadata.licenses?.length) {
+      array = array.concat(
+        this.metadata.licenses
+          .filter((c) => c.text)
+          .map((c) => ({ text: c.text, url: c.url }))
+      )
     }
     return array
   }
@@ -49,11 +77,24 @@ export class MetadataInfoComponent {
     }
   }
 
+  get temporalExtent(): { start: string; end: string } {
+    const temporalExtents = this.metadata.temporalExtents
+    return getTemporalRangeUnion(temporalExtents)
+  }
+
+  get shownOrganization() {
+    return this.metadata.ownerOrganization
+  }
+
+  get resourceContact() {
+    return this.metadata.contactsForResource?.[0]
+  }
+
   fieldReady(propName: string) {
     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/notification/notification.component.html

@@ -0,0 +1,52 @@
+<div
+  class="p-[16px] flex flex-row gap-[16px] items-start border border-gray-200 shadow-md rounded bg-background"
+>
+  <div
+    role="alert"
+    class="rounded-full text-white p-[6px] w-[32px] h-[32px] flex shrink-0"
+    [ngClass]="{
+      'bg-red-500': type === 'error',
+      'bg-yellow-500': type === 'warning',
+      'bg-green-500': type === 'success',
+      'bg-blue-500': type === 'info'
+    }"
+    [ngSwitch]="type"
+  >
+    <mat-icon class="material-symbols-outlined !w-[18px] !h-[18px] text-[20px]">
+      <ng-container *ngSwitchCase="'success'">check_circle</ng-container>
+      <ng-container *ngSwitchCase="'info'">info</ng-container>
+      <ng-container *ngSwitchCase="'warning'">warning</ng-container>
+      <ng-container *ngSwitchCase="'error'">error</ng-container>
+    </mat-icon>
+  </div>
+  <div
+    class="flex flex-col items-start gap-[4px] pt-[3px] grow shrink overflow-hidden"
+  >
+    <div class="font-bold text-[16px] text-gray-900">
+      {{ title }}
+    </div>
+    <div class="text-[14px] text-gray-800">
+      {{ text }}
+    </div>
+    <a
+      href
+      *ngIf="closeMessage"
+      class="text-[14px] gn-ui-link"
+      (click)="handleClose($event)"
+    >
+      {{ closeMessage }}
+    </a>
+  </div>
+  <gn-ui-button
+    type="light"
+    class="shrink-0"
+    (buttonClick)="handleClose()"
+    [style.--gn-ui-button-padding]="0"
+    [style.--gn-ui-button-width]="'21px'"
+    [style.--gn-ui-button-height]="'21px'"
+  >
+    <mat-icon class="material-symbols-outlined text-[22px] !w-[21px] !h-[21px]"
+      >close</mat-icon
+    >
+  </gn-ui-button>
+</div>

package/src/libs/ui/elements/src/lib/notification/notification.component.ts

@@ -0,0 +1,31 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { MatIconModule } from '@angular/material/icon'
+import { ButtonComponent } from '../../../../../../libs/ui/inputs/src'
+
+@Component({
+  selector: 'gn-ui-notification',
+  standalone: true,
+  imports: [CommonModule, MatIconModule, ButtonComponent],
+  templateUrl: './notification.component.html',
+  styleUrls: ['./notification.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class NotificationComponent {
+  @Input() type: 'info' | 'warning' | 'error' | 'success' = 'info'
+  @Input() title: string
+  @Input() text: string
+  @Input() closeMessage?: string
+  @Output() notificationClose = new EventEmitter<void>()
+
+  handleClose(event?: Event) {
+    event?.preventDefault()
+    this.notificationClose.emit()
+  }
+}

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.html

@@ -13,14 +13,14 @@
         </p>
       </button>
     </div>
-    <div class="flex flex-row flex-wrap justify-between flex-grow gap-5">
+    <div class="flex flex-row flex-wrap justify-between grow gap-5">
       <div class="flex flex-col gap-3">
         <p class="text-[14px]" translate>record.metadata.api.form.limit</p>
         <div class="flex flex-row items-center gap-2">
           <gn-ui-text-input
             class="mr-2 w-20"
-            (input)="setLimit($event.target.value)"
-            [value]="limit$ | async"
+            (valueChange)="setLimit($event)"
+            [value]="displayLimit$ | async"
             hint=""
           >
           </gn-ui-text-input>
@@ -28,8 +28,8 @@
             <input
               class="mr-2 cursor-pointer"
               type="checkbox"
-              [checked]="(limit$ | async) === ''"
-              (change)="setLimit('')"
+              [checked]="noLimitChecked$ | async"
+              (change)="setLimit('-1')"
             />
             <span class="text-sm" translate
               >record.metadata.api.form.limit.all</span
@@ -42,7 +42,7 @@
         <gn-ui-text-input
           class="w-20"
           [value]="offset$ | async"
-          (input)="setOffset($event.target.value)"
+          (valueChange)="setOffset($event)"
           hint=""
         >
         </gn-ui-text-input>

package/src/libs/ui/elements/src/lib/record-api-form/record-api-form.component.ts

@@ -4,7 +4,7 @@ import { BehaviorSubject, combineLatest, map } from 'rxjs'
 
 const DEFAULT_PARAMS = {
   OFFSET: '',
-  LIMIT: '',
+  LIMIT: '-1',
   FORMAT: 'json',
 }
 @Component({
@@ -44,17 +44,25 @@ export class RecordApiFormComponent {
       return outputUrl
     })
   )
+  noLimitChecked$ = this.limit$.pipe(
+    map((limit) => limit === '-1' || limit === '')
+  )
+
+  displayLimit$ = this.limit$.pipe(
+    map((limit) => (limit !== '-1' ? limit : ''))
+  )
 
   setOffset(value: string) {
     this.offset$.next(value)
   }
 
   setLimit(value: string) {
-    this.limit$.next(value)
+    const newLimit = value === '' ? '-1' : value
+    this.limit$.next(newLimit)
   }
 
-  setFormat(value: string) {
-    this.format$.next(value)
+  setFormat(value: string | unknown) {
+    this.format$.next(String(value))
   }
 
   resetUrl() {

package/src/libs/ui/elements/src/lib/related-record-card/related-record-card.component.html

@@ -6,7 +6,7 @@
   <div class="h-52 bg-gray-100">
     <gn-ui-thumbnail
       class="h-52 w-full object-cover"
-      [thumbnailUrl]="record.overviews?.[0].url.toString()"
+      [thumbnailUrl]="record.overviews?.[0]?.url.toString()"
     ></gn-ui-thumbnail>
   </div>
   <div class="flex flex-col justify-between h-44 px-5 pt-4 pb-6">

package/src/libs/ui/elements/src/lib/thumbnail/thumbnail.component.html

@@ -1,13 +1,13 @@
 <div
   #containerElement
-  class="h-full w-full relative shrink-0 overflow-hidden flex items-center"
+  class="h-full w-full relative shrink-0 overflow-hidden flex items-center justify-center"
   [ngClass]="isPlaceholder ? 'bg-gray-100' : 'bg-white'"
   [attr.data-cy-is-placeholder]="isPlaceholder.toString()"
 >
   <img
     #imageElement
     class="relative w-full object-center"
-    [ngClass]="imgFit === 'contain' ? 'h-4/5' : 'h-full'"
+    [ngClass]="imgFit === 'contain' ? 'h-4/5 w-4/5' : 'h-full'"
     [ngStyle]="{ objectFit: imgFit }"
     alt="thumbnail"
     loading="lazy"