geonetwork-ui 2.3.0-dev.6e2b8bea → 2.3.0-dev.89188551

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

@@ -20,16 +20,6 @@ import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { OverlayModule } from '@angular/cdk/overlay'
 import { MatCheckboxModule } from '@angular/material/checkbox'
 import { ViewportIntersectorComponent } from './viewport-intersector/viewport-intersector.component'
-import {
-  FormFieldArrayComponent,
-  FormFieldComponent,
-  FormFieldFileComponent,
-  FormFieldObjectComponent,
-  FormFieldRichComponent,
-  FormFieldSimpleComponent,
-  FormFieldSpatialExtentComponent,
-  FormFieldTemporalExtentComponent,
-} from './form-field'
 import { CheckToggleComponent } from './check-toggle/check-toggle.component'
 import { CopyTextButtonComponent } from './copy-text-button/copy-text-button.component'
 import { MatTooltipModule } from '@angular/material/tooltip'
@@ -42,10 +32,10 @@ import { MatInputModule } from '@angular/material/input'
 import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatNativeDateModule } from '@angular/material/core'
 import { EditableLabelDirective } from './editable-label/editable-label.directive'
+import { ImageInputComponent } from './image-input/image-input.component'
 
 @NgModule({
   declarations: [
-    DropdownSelectorComponent,
     AutocompleteComponent,
     TextInputComponent,
     DragAndDropFileInputComponent,
@@ -54,19 +44,10 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
     StarToggleComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
-    FormFieldComponent,
-    FormFieldSimpleComponent,
-    FormFieldArrayComponent,
-    FormFieldObjectComponent,
-    FormFieldRichComponent,
-    FormFieldFileComponent,
-    FormFieldSpatialExtentComponent,
-    FormFieldTemporalExtentComponent,
     CheckToggleComponent,
     CopyTextButtonComponent,
     CheckboxComponent,
     SearchInputComponent,
-    DateRangePickerComponent,
   ],
   imports: [
     CommonModule,
@@ -89,6 +70,9 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
     EditableLabelDirective,
     TextAreaComponent,
     ButtonComponent,
+    ImageInputComponent,
+    DropdownSelectorComponent,
+    DateRangePickerComponent,
   ],
   exports: [
     DropdownSelectorComponent,
@@ -102,13 +86,13 @@ import { EditableLabelDirective } from './editable-label/editable-label.directiv
     StarToggleComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
-    FormFieldComponent,
     CheckToggleComponent,
     CopyTextButtonComponent,
     CheckboxComponent,
     SearchInputComponent,
     DateRangePickerComponent,
     EditableLabelDirective,
+    ImageInputComponent,
   ],
 })
 export class UiInputsModule {}

package/src/libs/ui/layout/src/index.ts

@@ -1,8 +1,10 @@
-export * from './lib/ui-layout.module'
 export * from './lib/anchor-link/anchor-link.directive'
 export * from './lib/carousel/carousel.component'
-export * from './lib/expandable-panel/expandable-panel.component'
-export * from './lib/sticky-header/sticky-header.component'
 export * from './lib/expandable-panel-button/expandable-panel-button.component'
-export * from './lib/interactive-table/interactive-table.component'
+export * from './lib/expandable-panel/expandable-panel.component'
+export * from './lib/form-field-wrapper/form-field-wrapper.component'
 export * from './lib/interactive-table/interactive-table-column/interactive-table-column.component'
+export * from './lib/interactive-table/interactive-table.component'
+export * from './lib/sticky-header/sticky-header.component'
+export * from './lib/block-list/block-list.component'
+export * from './lib/ui-layout.module'

package/src/libs/ui/layout/src/lib/block-list/block-list.component.css

@@ -0,0 +1,23 @@
+:host .block-list-container ::ng-deep > * {
+  flex-shrink: 0;
+}
+
+:host {
+  position: relative;
+}
+
+.list-page-dot {
+  width: 6px;
+  height: 6px;
+  border-radius: 6px;
+  position: relative;
+}
+
+.list-page-dot:after {
+  content: '';
+  position: absolute;
+  left: -7px;
+  top: -7px;
+  width: 20px;
+  height: 20px;
+}

package/src/libs/ui/layout/src/lib/block-list/block-list.component.html

@@ -0,0 +1,20 @@
+<div
+  class="block-list-container flex flex-col"
+  #blockContainer
+  [ngClass]="containerClass"
+  [ngStyle]="{ minHeight: minHeight + 'px' }"
+>
+  <ng-content></ng-content>
+</div>
+<div
+  *ngIf="pagesCount > 1"
+  class="absolute flex flex-row justify-center gap-[14px] p-1"
+  [ngClass]="paginationContainerClass"
+>
+  <button
+    *ngFor="let page of pages"
+    class="list-page-dot"
+    (click)="goToPage(page)"
+    [ngClass]="currentPage === page ? 'bg-primary' : 'bg-gray-400'"
+  ></button>
+</div>

package/src/libs/ui/layout/src/lib/block-list/block-list.component.ts

@@ -0,0 +1,84 @@
+import {
+  AfterViewInit,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  ContentChildren,
+  ElementRef,
+  Input,
+  QueryList,
+  ViewChild,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+
+@Component({
+  selector: 'gn-ui-block-list',
+  templateUrl: './block-list.component.html',
+  styleUrls: ['./block-list.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
+})
+export class BlockListComponent implements AfterViewInit {
+  @Input() pageSize = 5
+  @Input() containerClass = ''
+  @Input() paginationContainerClass = 'w-full bottom-0 top-auto'
+  @ContentChildren('block', { read: ElementRef }) blocks: QueryList<
+    ElementRef<HTMLElement>
+  >
+  @ViewChild('blockContainer') blockContainer: ElementRef<HTMLElement>
+
+  protected minHeight = 0
+
+  protected currentPage = 0
+  protected get pages() {
+    return new Array(this.pagesCount).fill(0).map((_, i) => i)
+  }
+
+  get isFirstPage() {
+    return this.currentPage === 0
+  }
+  get isLastPage() {
+    return this.currentPage === this.pagesCount - 1
+  }
+  get pagesCount() {
+    return this.blocks ? Math.ceil(this.blocks.length / this.pageSize) : 1
+  }
+
+  constructor(private changeDetector: ChangeDetectorRef) {}
+
+  ngAfterViewInit() {
+    this.blocks.changes.subscribe(this.refreshBlocksVisibility)
+    this.refreshBlocksVisibility()
+
+    // we store the first height as the min-height of the list container
+    this.minHeight = this.blockContainer.nativeElement.clientHeight
+    this.changeDetector.detectChanges()
+  }
+
+  protected refreshBlocksVisibility = () => {
+    this.blocks.forEach((block, index) => {
+      block.nativeElement.style.display =
+        index >= this.currentPage * this.pageSize &&
+        index < (this.currentPage + 1) * this.pageSize
+          ? null
+          : 'none'
+    })
+  }
+
+  public goToPage(index: number) {
+    this.currentPage = Math.max(Math.min(index, this.pagesCount - 1), 0)
+    this.changeDetector.detectChanges()
+    this.refreshBlocksVisibility()
+  }
+
+  public previousPage() {
+    if (this.isFirstPage) return
+    this.goToPage(this.currentPage - 1)
+  }
+
+  public nextPage() {
+    if (this.isLastPage) return
+    this.goToPage(this.currentPage + 1)
+  }
+}

package/src/libs/ui/layout/src/lib/carousel/carousel.component.css

@@ -1,20 +1,23 @@
 :host .carousel-container ::ng-deep > * {
   flex-shrink: 0;
 }
+
 :host {
   position: relative;
 }
+
 .carousel-step-dot {
   width: 6px;
   height: 6px;
   border-radius: 6px;
   position: relative;
 }
+
 .carousel-step-dot:after {
   content: '';
   position: absolute;
-  left: -4px;
-  top: -4px;
-  width: 14px;
-  height: 14px;
+  left: -7px;
+  top: -7px;
+  width: 20px;
+  height: 20px;
 }

package/src/libs/ui/layout/src/lib/carousel/carousel.component.html

@@ -1,17 +1,17 @@
-<div #carouselOverflowContainer class="overflow-hidden h-full w-full">
-  <div class="carousel-container flex flex-row" [ngClass]="containerClass">
+<div #carouselOverflowContainer class="w-full">
+  <div class="carousel-container flex" [ngClass]="containerClass">
     <ng-content></ng-content>
   </div>
 </div>
 <div
   *ngIf="steps.length > 1"
-  class="absolute right-0 top-0 flex flex-row justify-center gap-[10px] p-1"
+  class="absolute flex flex-row justify-center gap-[14px] p-1"
   [ngClass]="stepsContainerClass"
 >
   <button
     *ngFor="let step of steps; let i = index"
     class="carousel-step-dot"
     (click)="scrollToStep(i)"
-    [ngClass]="selectedStep === i ? 'bg-secondary' : 'bg-gray-400'"
+    [ngClass]="currentStep === i ? 'bg-primary' : 'bg-gray-400'"
   ></button>
 </div>

package/src/libs/ui/layout/src/lib/carousel/carousel.component.ts

@@ -4,25 +4,49 @@ import {
   ChangeDetectorRef,
   Component,
   ElementRef,
+  EventEmitter,
   Input,
+  Output,
   ViewChild,
 } from '@angular/core'
 import EmblaCarousel, { EmblaCarouselType } from 'embla-carousel'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-carousel',
   templateUrl: './carousel.component.html',
   styleUrls: ['./carousel.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule],
 })
 export class CarouselComponent implements AfterViewInit {
+  @ViewChild('carouselOverflowContainer') carouselOverflowContainer: ElementRef
+
   @Input() containerClass = ''
-  @Input() stepsContainerClass = ''
-  @ViewChild('carouselOverflowContainer')
-  carouselOverflowContainer: ElementRef
-  steps: number[] = []
-  selectedStep = -1
-  emblaApi: EmblaCarouselType
+  @Input() stepsContainerClass = 'w-full bottom-0 top-auto'
+  @Output() currentStepChange = new EventEmitter<number>()
+
+  protected steps: number[] = []
+  protected emblaApi: EmblaCarouselType
+  protected currentStep = 0
+
+  protected refreshSteps = () => {
+    this.steps = this.emblaApi.scrollSnapList()
+    this.currentStep = this.emblaApi.selectedScrollSnap()
+    this.currentStepChange.emit(this.currentStep)
+    this.changeDetector.detectChanges()
+  }
+
+  get isFirstStep() {
+    return this.currentStep === 0
+  }
+  get isLastStep() {
+    return this.currentStep === this.steps.length - 1
+  }
+  get stepsCount() {
+    return this.steps.length
+  }
 
   constructor(private changeDetector: ChangeDetectorRef) {}
 
@@ -33,18 +57,24 @@ export class CarouselComponent implements AfterViewInit {
         duration: 15,
       }
     )
-    const refreshSteps = () => {
-      this.steps = this.emblaApi.scrollSnapList()
-      this.selectedStep = this.emblaApi.selectedScrollSnap()
-      this.changeDetector.detectChanges()
-    }
+
     this.emblaApi
-      .on('init', refreshSteps)
-      .on('reInit', refreshSteps)
-      .on('select', refreshSteps)
+      .on('init', this.refreshSteps)
+      .on('reInit', this.refreshSteps)
+      .on('select', this.refreshSteps)
   }
 
-  scrollToStep(stepIndex: number) {
+  public scrollToStep(stepIndex: number) {
     this.emblaApi.scrollTo(stepIndex)
   }
+
+  public slideToPrevious() {
+    if (this.isFirstStep) return
+    this.emblaApi.scrollPrev()
+  }
+
+  public slideToNext() {
+    if (this.isLastStep) return
+    this.emblaApi.scrollNext()
+  }
 }

package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.html

@@ -0,0 +1,18 @@
+<div class="h-full flex flex-col">
+  <div class="flex-none w-full flex flex-row items-center">
+    <span class="flex-none font-bold">{{ label }}</span>
+    <div class="flex-1 flex justify-end items-center">
+      <ng-content select="[form-field-interaction]"></ng-content>
+      <span
+        class="material-symbols-outlined m-2 gn-ui-icon-small"
+        [matTooltip]="hint"
+        matTooltipPosition="above"
+      >
+        help
+      </span>
+    </div>
+  </div>
+  <div class="flex-1">
+    <ng-content></ng-content>
+  </div>
+</div>

package/src/libs/ui/layout/src/lib/form-field-wrapper/form-field-wrapper.component.ts

@@ -0,0 +1,16 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { MatIconModule } from '@angular/material/icon'
+import { MatTooltipModule } from '@angular/material/tooltip'
+
+@Component({
+  selector: 'gn-ui-form-field-wrapper',
+  templateUrl: './form-field-wrapper.component.html',
+  styleUrls: ['./form-field-wrapper.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [MatIconModule, MatTooltipModule],
+})
+export class FormFieldWrapperComponent {
+  @Input() label: string
+  @Input() hint: string
+}

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

@@ -15,14 +15,12 @@ import { CarouselComponent } from './carousel/carousel.component'
     StickyHeaderComponent,
     AnchorLinkDirective,
     ExpandablePanelButtonComponent,
-    CarouselComponent,
   ],
   exports: [
     ExpandablePanelComponent,
     StickyHeaderComponent,
     AnchorLinkDirective,
     ExpandablePanelButtonComponent,
-    CarouselComponent,
   ],
 })
 export class UiLayoutModule {}

package/src/libs/util/shared/src/lib/links/link-classifier.service.ts

@@ -26,7 +26,7 @@ export class LinkClassifierService {
           case 'wmts':
             return [LinkUsage.API, LinkUsage.MAP_API]
           case 'ogcFeatures':
-            return [LinkUsage.API]
+            return [LinkUsage.API, LinkUsage.DOWNLOAD, LinkUsage.GEODATA]
           default:
             return [LinkUsage.UNKNOWN]
         }

package/src/libs/util/shared/src/lib/links/link-utils.ts

@@ -94,6 +94,27 @@ export const FORMATS = {
     color: '#de630b',
     mimeTypes: ['application/x-dxf', 'image/x-dxf'],
   },
+  html: {
+    extensions: ['html', 'htm'],
+    priority: 12,
+    color: '#f2bb3a',
+    mimeTypes: ['text/html'],
+  },
+  fgb: {
+    extensions: ['fgb', 'flatgeobuf'],
+    priority: 13,
+    color: '#f2bb3a',
+    mimeTypes: ['application/flatgeobuf'],
+  },
+  jsonfg: {
+    extensions: ['jsonfg', 'jsonfgc'],
+    priority: 14,
+    color: '#f2bb3a',
+    mimeTypes: [
+      'application/vnd.ogc.fg+json',
+      'application/vnd.ogc.fg+json;compatibility=geojson',
+    ],
+  },
 } as const
 
 export type FileFormat = keyof typeof FORMATS

package/src/libs/util/shared/src/lib/utils/bytes-convert.ts

@@ -0,0 +1,3 @@
+export function megabytesToBytes(megabytes) {
+  return megabytes * 1048576
+}

package/src/libs/util/shared/src/lib/utils/image-resize.ts

@@ -0,0 +1,72 @@
+export function downsizeImage(
+  blob: Blob,
+  maxWidth: number,
+  maxHeight: number
+): Promise<Blob> {
+  return new Promise((resolve, reject) => {
+    const image = new Image()
+    image.src = URL.createObjectURL(blob)
+    image.onload = () => {
+      let width = image.width
+      let height = image.height
+
+      if (width > maxWidth || height > maxHeight) {
+        if (width > height) {
+          height = height * (maxWidth / width)
+          width = maxWidth
+        } else {
+          width = width * (maxHeight / height)
+          height = maxHeight
+        }
+      }
+
+      const canvas = document.createElement('canvas')
+      canvas.width = width
+      canvas.height = height
+
+      const context = canvas.getContext('2d')
+      context.drawImage(image, 0, 0, width, height)
+
+      canvas.toBlob(resolve, blob.type)
+    }
+    image.onerror = reject
+  })
+}
+
+export function downgradeImage(
+  blob: Blob,
+  maxSizeBytes: number
+): Promise<Blob> {
+  return new Promise((resolve, reject) => {
+    const image = new Image()
+    image.src = URL.createObjectURL(blob)
+    image.onload = () => {
+      const width = image.width
+      const height = image.height
+      let quality = 1.0
+
+      const canvas = document.createElement('canvas')
+      canvas.width = width
+      canvas.height = height
+
+      const context = canvas.getContext('2d')
+      context.drawImage(image, 0, 0, width, height)
+
+      const compressAndResolveBlob = (blobToCompress: Blob) => {
+        if (blobToCompress.size <= maxSizeBytes) {
+          resolve(blobToCompress)
+        } else {
+          quality -= 0.1
+          if (quality >= 0) {
+            canvas.toBlob(compressAndResolveBlob, blob.type, quality)
+          } else {
+            reject('Unable to compress image below max size')
+          }
+        }
+      }
+
+      canvas.toBlob(compressAndResolveBlob, blob.type, quality)
+    }
+    image.onerror = reject
+  })
+}

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -1,9 +1,11 @@
+export * from './bytes-convert'
+export * from './event'
+export * from './fuzzy-filter'
+export * from './geojson'
+export * from './image-resize'
 export * from './parse'
-export * from './strip-html'
 export * from './remove-whitespace'
-export * from './geojson'
 export * from './sort-by'
-export * from './url'
-export * from './event'
-export * from './fuzzy-filter'
+export * from './strip-html'
 export * from './temporal-extent-union'
+export * from './url'

package/tailwind.base.css

@@ -9,6 +9,42 @@
     @apply shadow-xl hover:shadow-xl-hover transition-shadow;
   }
 
+  /* ICON CLASSES */
+  .gn-ui-icon-small {
+    font-size: 16px;
+    width: 16px;
+    height: 16px;
+  }
+
+  /* LINK CLASSES */
+  .gn-ui-link {
+    @apply text-blue-600 hover:text-blue-700 hover:underline;
+    text-underline-offset: 0.2em;
+    text-decoration-thickness: 1px;
+  }
+  .gn-ui-link-external-icon {
+    content: 'open_in_new';
+    font-family: 'Material Symbols Outlined';
+    font-size: 0.9em;
+    display: inline-block;
+    vertical-align: top;
+    padding-top: 0.1em;
+  }
+  .gn-ui-link-external {
+    @apply gn-ui-link;
+  }
+  .gn-ui-link-external::before {
+    @apply gn-ui-link-external-icon;
+    padding-right: 0.2em;
+  }
+  .gn-ui-link-external-after {
+    @apply gn-ui-link;
+  }
+  .gn-ui-link-external-after::after {
+    @apply gn-ui-link-external-icon;
+    padding-left: 0.2em;
+  }
+
   /* BUTTON CLASSES */
   /* these are used behind the scenes by the `gn-ui-button` component */
 

package/translations/de.json

@@ -1,4 +1,5 @@
 {
+  "button.login": "",
   "catalog.figures.datasets": "{count, plural, =0{Datensätze} one{Datensatz} other{Datensätze}}",
   "catalog.figures.organisations": "{count, plural, =0{Organisationen} one{Organisation} other{Organisationen}}",
   "chart.aggregation.average": "Durchschnitt",
@@ -144,7 +145,26 @@
   "downloads.format.unknown": "unbekannt",
   "downloads.wfs.featuretype.not.found": "Der Layer wurde nicht gefunden",
   "dropFile": "Datei ablegen",
+  "editor.record.form.license": "Lizenz",
+  "editor.record.form.license.cc-by": "",
+  "editor.record.form.license.cc-by-sa": "",
+  "editor.record.form.license.cc-zero": "",
+  "editor.record.form.license.etalab": "",
+  "editor.record.form.license.etalab-v2": "",
+  "editor.record.form.license.odbl": "",
+  "editor.record.form.license.odc-by": "",
+  "editor.record.form.license.pddl": "",
+  "editor.record.form.license.unknown": "Unbekannt oder nicht vorhanden",
+  "editor.record.form.resourceUpdated": "",
+  "editor.record.loadError.body": "",
+  "editor.record.loadError.closeMessage": "",
+  "editor.record.loadError.title": "",
   "editor.record.publish": "",
+  "editor.record.publishError.body": "",
+  "editor.record.publishError.closeMessage": "",
+  "editor.record.publishError.title": "",
+  "editor.record.publishSuccess.body": "",
+  "editor.record.publishSuccess.title": "",
   "editor.record.upToDate": "",
   "externalviewer.dataset.unnamed": "Datensatz aus dem Datahub",
   "facets.block.title.OrgForResource": "Organisation",
@@ -159,6 +179,16 @@
   "facets.block.title.tag.default": "Stichwort",
   "facets.block.title.th_regions_tree.default": "Regionen",
   "favorite.not.authenticated.tooltip": "<div><a href=' {link} '>Anmelden</a>, um auf diese Funktion zuzugreifen</div>",
+  "input.image.altTextPlaceholder": "",
+  "input.image.delete": "",
+  "input.image.displayAltTextInput": "",
+  "input.image.displayUrlInput": "",
+  "input.image.dropFileLabel": "",
+  "input.image.selectFileLabel": "",
+  "input.image.uploadErrorLabel": "",
+  "input.image.uploadErrorRetry": "",
+  "input.image.uploadProgressCancel": "",
+  "input.image.uploadProgressLabel": "",
   "language.ca": "Katalanisch",
   "language.cs": "Tschechisch",
   "language.de": "Deutsch",
@@ -196,6 +226,7 @@
   "multiselect.filter.placeholder": "Suche",
   "nav.back": "Zurück",
   "next": "weiter",
+  "ogc.unreachable.unknown": "Der Dienst konnte nicht erreicht werden",
   "organisation.filter.placeholder": "Ergebnisse filtern",
   "organisation.sort.sortBy": "Sortieren nach:",
   "organisations.hits.found": "{hits, plural, =0{Keine Organisation gefunden} other{{hits} von {total} Organisationen angezeigt}}",
@@ -274,6 +305,14 @@
   "record.metadata.updateFrequency": "Aktualisierungsfrequenz der Daten",
   "record.metadata.updatedOn": "Letzte Aktualisierung der Dateninformationen",
   "record.metadata.usage": "Nutzung und Einschränkungen",
+  "record.metadata.userFeedbacks": "",
+  "record.metadata.userFeedbacks.anonymousUser": "",
+  "record.metadata.userFeedbacks.newAnswer.buttonTitle": "",
+  "record.metadata.userFeedbacks.newAnswer.placeholder": "",
+  "record.metadata.userFeedbacks.newComment.placeholder": "",
+  "record.metadata.userFeedbacks.sortSelector.choices.newestFirst": "",
+  "record.metadata.userFeedbacks.sortSelector.choices.oldestFirst": "",
+  "record.metadata.userFeedbacks.sortSelector.label": "",
   "record.more.details": "Weitere Details",
   "record.tab.chart": "Diagramm",
   "record.tab.data": "Tabelle",