geonetwork-ui 2.2.0-dev.2446b017 → 2.2.0-dev.2a6e8d6d

package/src/libs/feature/map/src/lib/layers-panel/layers-panel.component.html

@@ -31,13 +31,19 @@
         </div>
       </mat-tab>
       <mat-tab [label]="'map.add.layer.wms' | translate" bodyClass="h-full">
-        <div class="p-3 h-full">Add from WMS</div>
+        <div class="p-3">
+          <gn-ui-add-layer-from-wms></gn-ui-add-layer-from-wms>
+        </div>
       </mat-tab>
       <mat-tab [label]="'map.add.layer.wfs' | translate" bodyClass="h-full">
-        <div class="p-3 h-full">Add from WFS</div>
+        <div class="p-3">
+          <gn-ui-add-layer-from-wfs></gn-ui-add-layer-from-wfs>
+        </div>
       </mat-tab>
       <mat-tab [label]="'map.add.layer.file' | translate" bodyClass="h-full">
-        <div class="p-3 h-full">Add from file</div>
+        <div class="p-3">
+          <gn-ui-add-layer-from-file></gn-ui-add-layer-from-file>
+        </div>
       </mat-tab>
     </mat-tab-group>
   </gn-ui-expandable-panel-button>

package/src/libs/feature/map/src/lib/map-context/map-context.service.ts

@@ -40,6 +40,8 @@ export const DEFAULT_VIEW: MapContextViewModel = {
   zoom: 2,
 }
 
+export const WFS_MAX_FEATURES = 10000
+
 @Injectable({
   providedIn: 'root',
 })
@@ -111,6 +113,10 @@ export class MapContextService {
               urlObj.searchParams.set('typename', layerModel.name)
               urlObj.searchParams.set('srsname', 'EPSG:3857')
               urlObj.searchParams.set('bbox', `${extent.join(',')},EPSG:3857`)
+              urlObj.searchParams.set(
+                'maxFeatures',
+                WFS_MAX_FEATURES.toString()
+              )
               return urlObj.toString()
             },
             strategy: bboxStrategy,

package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.html

@@ -1,10 +1,18 @@
-<div>
-  <span class="align-text-top mr-1.5 favorite-count" *ngIf="hasFavoriteCount">{{
-    favoriteCount
-  }}</span>
+<div class="flex flex-row content-center">
+  <span
+    class="align-text-top mr-1.5 mt-1.5 favorite-count"
+    *ngIf="hasFavoriteCount && displayCount"
+    >{{ favoriteCount }}</span
+  >
   <gn-ui-star-toggle
     [toggled]="isFavorite$ | async"
     (newValue)="toggleFavorite($event)"
     [disabled]="loading || (isAnonymous$ | async)"
+    class="mt-1"
   ></gn-ui-star-toggle>
+  <span
+    class="align-text-top ml-1.5 favorite-count mt-1.5"
+    *ngIf="!displayCount"
+    translate="datahub.record.addToFavorites"
+  ></span>
 </div>

package/src/libs/feature/search/src/lib/favorites/favorite-star/favorite-star.component.ts

@@ -24,6 +24,7 @@ import { PlatformServiceInterface } from '../../../../../../../libs/common/domai
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FavoriteStarComponent implements AfterViewInit, OnDestroy {
+  @Input() displayCount? = true
   @Input() set record(value) {
     this.record_ = value
     this.favoriteCount =

package/src/libs/ui/catalog/src/lib/language-switcher/language-switcher.component.html

@@ -5,5 +5,6 @@
   [selected]="currentLang"
   ariaName="languages"
   [showTitle]="false"
+  [extraBtnClass]="'flex justify-items-center text-white !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/elements/src/index.ts

@@ -18,4 +18,7 @@ export * from './lib/pagination/pagination.component'
 export * from './lib/related-record-card/related-record-card.component'
 export * from './lib/search-results-error/search-results-error.component'
 export * from './lib/user-preview/user-preview.component'
+export * from './lib/max-lines/max-lines.component'
 export * from './lib/record-api-form/record-api-form.component'
+export * from './lib/markdown-parser/markdown-parser.component'
+export * from './lib/image-overlay-preview/image-overlay-preview.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,29 @@
+<gn-ui-content-ghost
+  [showContent]="imageUrl !== undefined"
+  ghostClass="h-36 mb-3"
+>
+  <div
+    *ngIf="imageUrl"
+    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"
+  >
+    <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-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 !important;
+  @apply font-bold;
+}
+
+:host ::ng-deep .markdown-body p > a:hover {
+  color: var(--color-primary-darker) !important;
+}
+
+/** 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,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/metadata-contact/metadata-contact.component.html

@@ -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,32 +1,10 @@
-<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>
   </gn-ui-content-ghost>
@@ -97,12 +75,61 @@
   *ngIf="metadata.landingPage"
   [title]="'record.metadata.details' | 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.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 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>
+    </div>
   </div>
 </gn-ui-expandable-panel>

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

@@ -56,4 +56,9 @@ export class MetadataInfoComponent {
   onKeywordClick(keyword: string) {
     this.keyword.emit(keyword)
   }
+
+  copyText() {
+    navigator.clipboard.writeText(this.metadata.uniqueIdentifier)
+    ;(event.target as HTMLElement).blur()
+  }
 }

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

@@ -10,6 +10,8 @@ import {
   Optional,
   SimpleChanges,
   ViewChild,
+  Output,
+  EventEmitter,
 } from '@angular/core'
 
 export const THUMBNAIL_PLACEHOLDER = new InjectionToken<string>(
@@ -36,6 +38,7 @@ export class ThumbnailComponent implements OnInit, OnChanges {
   @Input() fit: FitOptions | FitOptions[] = 'cover'
   @ViewChild('imageElement') imgElement: ElementRef<HTMLImageElement>
   @ViewChild('containerElement') containerElement: ElementRef<HTMLDivElement>
+  @Output() placeholderShown = new EventEmitter<boolean>()
   imgUrl: string
   imgFit: FitOptions
   placeholderUrl = this.optionalPlaceholderUrl || DEFAULT_PLACEHOLDER
@@ -85,6 +88,7 @@ export class ThumbnailComponent implements OnInit, OnChanges {
   private setNewSrcImage(image: ThumbnailImageObject) {
     this.imgFit = image.fit
     this.imgUrl = image.url
+    this.placeholderShown.emit(this.isPlaceholder)
   }
 
   private setPlaceholder(): void {

package/src/libs/ui/elements/src/lib/ui-elements.module.ts

@@ -29,6 +29,8 @@ import { GnUiLinkifyDirective } from './metadata-info/linkify.directive'
 import { PaginationButtonsComponent } from './pagination-buttons/pagination-buttons.component'
 import { MaxLinesComponent } from './max-lines/max-lines.component'
 import { RecordApiFormComponent } from './record-api-form/record-api-form.component'
+import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
+import { ImageOverlayPreviewComponent } from './image-overlay-preview/image-overlay-preview.component'
 
 @NgModule({
   imports: [
@@ -65,6 +67,8 @@ import { RecordApiFormComponent } from './record-api-form/record-api-form.compon
     PaginationButtonsComponent,
     MaxLinesComponent,
     RecordApiFormComponent,
+    MarkdownParserComponent,
+    ImageOverlayPreviewComponent,
   ],
   exports: [
     MetadataInfoComponent,
@@ -84,7 +88,10 @@ import { RecordApiFormComponent } from './record-api-form/record-api-form.compon
     AvatarComponent,
     UserPreviewComponent,
     PaginationButtonsComponent,
+    MaxLinesComponent,
     RecordApiFormComponent,
+    MarkdownParserComponent,
+    ImageOverlayPreviewComponent,
   ],
 })
 export class UiElementsModule {}

package/src/libs/ui/inputs/src/lib/button/button.component.css

@@ -1,5 +1,5 @@
 /* makes sure icons will not make the buttons grow vertically */
-:host /deep/ mat-icon.mat-icon {
+:host ::ng-deep mat-icon.mat-icon {
   margin-top: -0.325em;
   margin-bottom: -0.325em;
 }