geonetwork-ui 2.1.0-initial → 2.2.0-dev.05d3ea32

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

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

@@ -0,0 +1,15 @@
+<div
+  #container
+  class="max-lines overflow-hidden transition-[max-height] duration-300"
+  [ngClass]="isExpanded ? 'ease-in' : 'ease-out'"
+  [style.maxHeight]="maxHeight"
+>
+  <ng-content></ng-content>
+</div>
+<div
+  *ngIf="showToggleButton"
+  (click)="toggleDisplay()"
+  class="text-secondary cursor-pointer pt-2.5"
+>
+  {{ (isExpanded ? 'ui.readLess' : 'ui.readMore') | translate }}
+</div>

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

@@ -0,0 +1,83 @@
+import {
+  Component,
+  Input,
+  ElementRef,
+  ChangeDetectionStrategy,
+  AfterViewInit,
+  ViewChild,
+  OnDestroy,
+  ChangeDetectorRef,
+} from '@angular/core'
+
+@Component({
+  selector: 'gn-ui-max-lines',
+  templateUrl: './max-lines.component.html',
+  styleUrls: ['./max-lines.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MaxLinesComponent implements AfterViewInit, OnDestroy {
+  @Input() maxLines = 6
+
+  isExpanded = false
+  maxHeight = ''
+  showToggleButton = false
+  observer: ResizeObserver
+
+  @ViewChild('container') container!: ElementRef
+
+  constructor(private cdr: ChangeDetectorRef) {}
+
+  ngAfterViewInit() {
+    this.calculateMaxHeight()
+
+    this.observer = new ResizeObserver((mutations) => {
+      mutations.forEach(() => {
+        this.calculateMaxHeight()
+      })
+    })
+
+    this.observer.observe(this.container.nativeElement.children[0])
+  }
+
+  toggleDisplay() {
+    this.isExpanded = !this.isExpanded
+    this.calculateMaxHeight()
+  }
+
+  calculateMaxHeight() {
+    const containerElement = this.container.nativeElement
+    const contentElement = containerElement.children[0]
+    const contentHeight = contentElement.getBoundingClientRect().height
+
+    if (contentHeight) {
+      if (contentHeight > this.maxLines * this.getLineHeight(contentElement)) {
+        this.showToggleButton = true
+
+        this.maxHeight = this.isExpanded
+          ? `${contentHeight}px`
+          : `${this.maxLines * this.getLineHeight(contentElement)}px`
+      } else {
+        this.showToggleButton = false
+        this.maxHeight = `${contentHeight}px`
+      }
+      containerElement.setAttribute(
+        'style',
+        `max-height: ${this.maxHeight}; overflow: hidden`
+      )
+
+      this.cdr.detectChanges()
+    }
+  }
+
+  getLineHeight(element: HTMLElement): number {
+    const computedStyle = window.getComputedStyle(element)
+    const lineHeight = parseFloat(computedStyle.lineHeight)
+    const fontSize = parseFloat(computedStyle.fontSize || '14')
+    const result = isNaN(lineHeight) ? fontSize * 1.2 : lineHeight // Use a default if line height is not specified
+    return result
+  }
+
+  ngOnDestroy(): void {
+    this.observer.unobserve(this.container.nativeElement.children[0])
+  }
+}

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

@@ -1,32 +1,98 @@
-<div *ngIf="shownOrganization" class="mb-6 sm:mb-12">
-  <p class="text-gray-700 text-xs mb-3 uppercase" translate>
-    record.metadata.contact
-  </p>
-  <div class="flex mb-1">
+<div class="py-5 px-5 rounded bg-gray-100 text-black mb-6 sm:mb-12">
+  <div class="grid gap-3">
+    <div>
+      <p class="text-sm font-medium" translate>record.metadata.contact</p>
+    </div>
     <div
-      class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
-      (click)="onOrganizationClick()"
+      *ngIf="shownOrganization?.logoUrl?.href"
+      class="flex items-center justify-center border-solid border border-gray-300 rounded-md bg-white h-32 overflow-hidden"
     >
-      {{ shownOrganization.name }}
+      <gn-ui-thumbnail
+        class="relative h-full w-full"
+        [thumbnailUrl]="shownOrganization.logoUrl.href"
+        fit="contain"
+      ></gn-ui-thumbnail>
+    </div>
+    <div class="grid gap-1">
+      <div class="flex">
+        <div
+          class="text-primary font-title text-21 mr-2 cursor-pointer hover:underline"
+          (click)="onOrganizationClick()"
+          data-cy="organization-name"
+        >
+          {{ shownOrganization.name }}
+        </div>
+      </div>
+      <div *ngIf="shownOrganization?.website">
+        <a
+          [href]="shownOrganization.website"
+          target="_blank"
+          class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
+          >{{ shownOrganization.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>
+    <div class="grid gap-5 py-3 overflow-hidden">
+      <div *ngIf="contacts[0]?.phone">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+            >call_outline</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p class="text-sm">{{ contacts[0].phone }}</p>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.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="contacts.length"
+            [href]="'mailto:' + contacts[0].email"
+            class="text-sm hover:underline ml-2"
+            target="_blank"
+            data-cy="contact-email"
+            >{{ contacts[0].email }}</a
+          >
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.firstName || contacts[0]?.lastName">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+            >person_outline</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p class="text-sm">
+              {{ contacts[0]?.firstName || '' }}
+              {{ contacts[0]?.lastName || '' }}
+            </p>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="contacts[0]?.address">
+        <div class="flex">
+          <mat-icon
+            class="material-symbols-outlined !w-5 !h-5 !text-[20px] opacity-75 shrink-0"
+          >
+            location_on</mat-icon
+          >
+          <div class="flex flex-col ml-2">
+            <p *ngFor="let addressPart of address" class="text-sm">
+              {{ addressPart }}
+            </p>
+          </div>
+        </div>
+      </div>
     </div>
-  </div>
-  <a
-    *ngIf="contacts.length"
-    [href]="'mailto:' + contacts[0].email"
-    class="text-gray-700 text-sm hover:underline"
-    target="_blank"
-    >{{ contacts[0].email }}</a
-  >
-  <div *ngIf="shownOrganization.website" class="mb-2">
-    <a
-      [href]="shownOrganization.website"
-      target="_blank"
-      class="contact-website text-primary text-sm cursor-pointer hover:underline transition-all"
-      >{{ shownOrganization.website }}
-      <mat-icon
-        class="material-symbols-outlined !w-[12px] !h-[12px] !text-[12px] opacity-75"
-        >open_in_new</mat-icon
-      >
-    </a>
   </div>
 </div>

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

@@ -9,7 +9,7 @@ import {
   CatalogRecord,
   Individual,
   Organization,
-} from '../../../../../../libs/common/domain/src/lib/record'
+} from '../../../../../../libs/common/domain/src/lib/model/record'
 
 @Component({
   selector: 'gn-ui-metadata-contact',
@@ -34,6 +34,13 @@ export class MetadataContactComponent {
     )
   }
 
+  get address() {
+    const addressParts = this.contacts[0].address
+      .split(',')
+      .map((part) => part.trim())
+    return addressParts
+  }
+
   onOrganizationClick() {
     this.organizationClick.emit(this.shownOrganization)
   }

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

@@ -9,30 +9,72 @@ export class GnUiLinkifyDirective implements OnInit {
 
   ngOnInit() {
     setTimeout(() => {
-      this.processLinks()
+      this.processLinks(this.el.nativeElement)
     }, 0)
   }
 
-  private processLinks() {
-    const container = this.el.nativeElement
-
+  private processLinks(container: HTMLElement | ChildNode) {
     const nodes = Array.from(container.childNodes)
+
     nodes.forEach((node) => {
       if (node instanceof Text) {
         const textNode = node as Text
-        const linkified = this.linkifyText(textNode.nodeValue)
-        const span = this.renderer.createElement('span')
-        span.innerHTML = linkified
-        container.insertBefore(span, textNode)
-        container.removeChild(textNode)
+        const linkified = this.linkifyNode(textNode.nodeValue)
+        if (linkified) {
+          this.createLinkElements(container, linkified, node)
+        }
+      } else if (node instanceof HTMLAnchorElement) {
+        const url = node.href
+        const displayValue = node.innerHTML
+        const linkified = this.linkifyNode(displayValue, url)
+        if (linkified) {
+          this.createLinkElements(container, linkified, node)
+        }
+      } else {
+        this.processLinks(node)
       }
     })
   }
 
-  private linkifyText(text: string): string {
-    return text.replace(/(\bhttps?:\/\/\S+\b)/g, (match) => {
-      return `<a href="${match}" target="_blank"
-                  class="text-primary cursor-pointer hover:underline">${match} <mat-icon class="material-symbols-outlined !w-[12px] !h-[14px] !text-[14px] opacity-75">open_in_new</mat-icon></a>`
+  private linkifyNode(displayValue: string, url?: string): string | undefined {
+    if (url) {
+      displayValue = this.createLink(displayValue, url)
+    } else {
+      const urlRegex = /\bhttps?:\/\/(?:\([^\s()]+\)|[^\s()]+)+/g
+
+      const matches = displayValue.match(urlRegex)
+      if (matches && matches.length > 0) {
+        matches.forEach((match) => {
+          url = match
+
+          displayValue = displayValue.replace(match, (match) => {
+            return this.createLink(match, url)
+          })
+        })
+      }
+    }
+
+    return displayValue
+  }
+
+  private createLinkElements(
+    container: HTMLElement | ChildNode,
+    htmlContent: string,
+    node: ChildNode
+  ): void {
+    const div = this.renderer.createElement('div')
+    div.innerHTML = htmlContent
+
+    const fragment = document.createDocumentFragment()
+    Array.from(div.childNodes).forEach((childNode: ChildNode) => {
+      fragment.appendChild(childNode)
     })
+
+    container.insertBefore(fragment, node)
+    container.removeChild(node)
+  }
+
+  private createLink(displayValue: string, url: string): string {
+    return `<a href="${url}" target="_blank" class="text-primary cursor-pointer hover:underline">${displayValue} <mat-icon class="material-symbols-outlined !w-[12px] !h-[14px] !text-[14px] opacity-75">open_in_new</mat-icon></a>`
   }
 }

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);
+}