geonetwork-ui 2.2.0-dev.e0d0f7a1 → 2.2.0-dev.e441b922

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

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

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>