geonetwork-ui 2.4.0-dev.d5b28b1e → 2.4.0-dev.dcc96ff9

package/src/libs/ui/elements/src/lib/downloads-list/downloads-list.component.ts

@@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { TranslateService } from '@ngx-translate/core'
 import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import { getBadgeColor, getFileFormat } from '../../../../../../libs/util/shared/src'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 
 marker('datahub.search.filter.all')
 marker('datahub.search.filter.others')
@@ -19,11 +19,11 @@ type FilterFormat = typeof FILTER_FORMATS[number]
 export class DownloadsListComponent {
   constructor(private translateService: TranslateService) {}
 
-  @Input() links: DatasetDistribution[]
+  @Input() links: DatasetOnlineResource[]
 
   activeFilterFormats: FilterFormat[] = ['all']
 
-  get filteredLinks(): DatasetDistribution[] {
+  get filteredLinks(): DatasetOnlineResource[] {
     return this.links.filter((link) =>
       this.activeFilterFormats.some((format) =>
         this.isLinkOfFormat(link, format)
@@ -68,7 +68,7 @@ export class DownloadsListComponent {
     return format
   }
 
-  isLinkOfFormat(link: DatasetDistribution, format: FilterFormat): boolean {
+  isLinkOfFormat(link: DatasetOnlineResource, format: FilterFormat): boolean {
     if (format === 'all') {
       return true
     }
@@ -86,15 +86,15 @@ export class DownloadsListComponent {
     return getFileFormat(link).includes(format)
   }
 
-  getLinkFormat(link: DatasetDistribution) {
+  getLinkFormat(link: DatasetOnlineResource) {
     return getFileFormat(link)
   }
 
-  getLinkColor(link: DatasetDistribution) {
+  getLinkColor(link: DatasetOnlineResource) {
     return getBadgeColor(getFileFormat(link))
   }
 
-  isFromWfs(link: DatasetDistribution) {
+  isFromWfs(link: DatasetOnlineResource) {
     return link.type === 'download' && link.accessServiceProtocol === 'wfs'
   }
 }

package/src/libs/ui/elements/src/lib/link-card/link-card.component.ts

@@ -1,5 +1,5 @@
-import { Component, ChangeDetectionStrategy, Input } from '@angular/core'
-import { DatasetDistribution } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { DatasetOnlineResource } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { MatIconModule } from '@angular/material/icon'
 import { CommonModule } from '@angular/common'
 
@@ -12,7 +12,7 @@ import { CommonModule } from '@angular/common'
   imports: [CommonModule, MatIconModule],
 })
 export class LinkCardComponent {
-  @Input() link: DatasetDistribution
+  @Input() link: DatasetOnlineResource
   @Input() compact = false
 
   get title() {

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

@@ -29,6 +29,11 @@
   @apply text-title font-title font-bold;
 }
 
+/** No margin for first child/heading, that cannot be detected by getBoundingClientRect() **/
+:host ::ng-deep .markdown-body :first-child {
+  margin-top: 0;
+}
+
 :host ::ng-deep .markdown-body h1 {
   margin: 0.67em 0;
   padding-bottom: 0.3em;

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

@@ -21,7 +21,7 @@
             class="mr-2 w-20"
             (valueChange)="setLimit($event)"
             [value]="displayLimit$ | async"
-            hint=""
+            placeholder=""
           >
           </gn-ui-text-input>
           <div class="flex items-center">
@@ -47,7 +47,7 @@
             [value]="offset$ | async"
             [disabled]="!supportOffset"
             (valueChange)="supportOffset ? setOffset($event) : null"
-            hint=""
+            placeholder=""
           >
           </gn-ui-text-input>
           <div

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

@@ -20,7 +20,11 @@ import { MetadataQualityItemComponent } from './metadata-quality-item/metadata-q
 import { ErrorComponent } from './error/error.component'
 import { PaginationComponent } from './pagination/pagination.component'
 import { ThumbnailComponent } from './thumbnail/thumbnail.component'
-import { BadgeComponent, UiInputsModule } from '../../../../../libs/ui/inputs/src'
+import {
+  BadgeComponent,
+  TextInputComponent,
+  UiInputsModule,
+} from '../../../../../libs/ui/inputs/src'
 import { FormsModule } from '@angular/forms'
 import { AvatarComponent } from './avatar/avatar.component'
 import { UserPreviewComponent } from './user-preview/user-preview.component'
@@ -51,6 +55,7 @@ import { TimeSincePipe } from './user-feedback-item/time-since.pipe'
     TimeSincePipe,
     BadgeComponent,
     MaxLinesComponent,
+    TextInputComponent,
   ],
   declarations: [
     MetadataInfoComponent,

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

@@ -21,3 +21,7 @@ export * from './lib/text-input/text-input.component'
 export * from './lib/ui-inputs.module'
 export * from './lib/viewport-intersector/viewport-intersector.component'
 export * from './lib/previous-next-buttons/previous-next-buttons.component'
+export * from './lib/switch-toggle/switch-toggle.component'
+export * from './lib/file-input/file-input.component'
+export * from './lib/image-input/image-input.component'
+export * from './lib/url-input/url-input.component'

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts

@@ -61,6 +61,7 @@ export class AutocompleteComponent
   @Input() action: (value: string) => Observable<AutocompleteItem[]>
   @Input() value?: AutocompleteItem
   @Input() clearOnSelection = false
+  @Input() preventCompleteOnSelection = false
   @Input() autoFocus = false
   @Input() minCharacterCount? = 3
   @Input() allowSubmit = true
@@ -206,13 +207,24 @@ export class AutocompleteComponent
     this.inputSubmitted.emit(this.inputRef.nativeElement.value)
   }
 
+  /**
+   * This function is triggered when an item is selected in the list of displayed items.
+   * If preventCompleteOnSelection is true then the input will be left as entered by the user.
+   * If preventCompleteOnSelection is false (by default) then the input will be completed with the item selected by the user.
+   * If clearOnSelection is true then the input will be cleared upon selection.
+   * @param event
+   */
   handleSelection(event: MatAutocompleteSelectedEvent) {
     this.cancelEnter = true
     this.itemSelected.emit(event.option.value)
-    if (this.clearOnSelection) {
-      this.lastInputValue$.pipe(first()).subscribe((any) => {
-        this.inputRef.nativeElement.value = any
+    if (this.preventCompleteOnSelection) {
+      this.lastInputValue$.pipe(first()).subscribe((lastInputValue) => {
+        this.inputRef.nativeElement.value = lastInputValue
       })
+      return
+    }
+    if (this.clearOnSelection) {
+      this.inputRef.nativeElement.value = ''
     }
   }
 }

package/src/libs/ui/inputs/src/lib/editable-label/editable-label.directive.ts

@@ -1,48 +1,62 @@
 import {
+  AfterViewInit,
   Directive,
   ElementRef,
-  Renderer2,
-  AfterViewInit,
   EventEmitter,
-  Output,
   Input,
+  OnChanges,
+  Output,
+  Renderer2,
 } from '@angular/core'
 
 @Directive({
   selector: '[gnUiEditableLabel]',
   standalone: true,
 })
-export class EditableLabelDirective implements AfterViewInit {
+export class EditableLabelDirective implements OnChanges, AfterViewInit {
+  @Input() gnUiEditableLabel?: string
   @Output() editableLabelChanged = new EventEmitter<string>()
-  @Input() gnUiEditableLabel?: boolean
+
+  appendedInput: HTMLInputElement
 
   constructor(private el: ElementRef, private renderer: Renderer2) {}
 
+  ngOnChanges() {
+    if (this.appendedInput) {
+      this.renderer.setProperty(
+        this.appendedInput,
+        'value',
+        this.gnUiEditableLabel
+      )
+    }
+  }
+
   ngAfterViewInit() {
-    if (this.gnUiEditableLabel !== false) {
-      const appendedInput = this.renderer.createElement('input')
-
-      this.renderer.setStyle(appendedInput, 'background', 'inherit')
-      this.renderer.setStyle(appendedInput, 'color', 'inherit')
-      this.renderer.setStyle(appendedInput, 'font', 'inherit')
-      this.renderer.setStyle(appendedInput, 'border', 'inherit')
-      this.renderer.setStyle(appendedInput, 'width', '100%')
-      this.renderer.setStyle(appendedInput, 'padding', 'inherit')
-      this.renderer.setStyle(appendedInput, 'margin', '0')
-      this.renderer.setStyle(appendedInput, 'height', 'inherit')
-      this.renderer.setStyle(appendedInput, 'line-height', 'inherit')
-      this.renderer.setStyle(appendedInput, 'text-decoration', 'inherit')
-
-      const hostContent = this.el.nativeElement.textContent || ''
-      const formattedContent = hostContent.replace(/\s+/g, ' ').trim()
-      this.renderer.setProperty(appendedInput, 'value', formattedContent)
-      this.renderer.setProperty(this.el.nativeElement, 'innerHTML', '')
-
-      this.renderer.listen(appendedInput, 'input', (event) => {
+    if (this.gnUiEditableLabel !== undefined) {
+      this.appendedInput = this.renderer.createElement('input')
+
+      this.renderer.setStyle(this.appendedInput, 'background', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'color', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'font', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'border', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'width', '100%')
+      this.renderer.setStyle(this.appendedInput, 'padding', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'margin', '0')
+      this.renderer.setStyle(this.appendedInput, 'height', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'line-height', 'inherit')
+      this.renderer.setStyle(this.appendedInput, 'text-decoration', 'inherit')
+
+      this.renderer.setProperty(
+        this.appendedInput,
+        'value',
+        this.gnUiEditableLabel
+      )
+
+      this.renderer.listen(this.appendedInput, 'input', (event) => {
         this.editableLabelChanged.emit(event.target.value)
       })
 
-      this.renderer.appendChild(this.el.nativeElement, appendedInput)
+      this.renderer.appendChild(this.el.nativeElement, this.appendedInput)
     }
   }
 }

package/src/libs/ui/inputs/src/lib/file-input/file-input.component.html

@@ -0,0 +1,85 @@
+<div class="w-full flex flex-col gap-[16px]">
+  <label
+    gnUiFilesDrop
+    class="flex-1 border-2 border-dashed rounded-lg p-6 flex flex-col items-center justify-center gap-4 transition-colors duration-100"
+    [ngClass]="{
+      'border-primary-lighter bg-primary-white': dragFilesOver,
+      'border-gray-300': !dragFilesOver
+    }"
+    (dragFilesOver)="handleDragFilesOver($event)"
+    (dropFiles)="handleDropFiles($event)"
+  >
+    <div
+      class="w-14 h-14 rounded-md bg-gray-50 grid"
+      *ngIf="!isUploadInProgress"
+    >
+      <mat-icon
+        *ngIf="!dragFilesOver"
+        class="material-symbols-outlined place-self-center text-primary"
+        >cloud_upload</mat-icon
+      >
+      <mat-icon
+        *ngIf="dragFilesOver"
+        class="material-symbols-outlined place-self-center text-primary"
+        >add_box</mat-icon
+      >
+    </div>
+    <div
+      *ngIf="isUploadInProgress"
+      class="w-14 h-14 grid items-center justify-center"
+    >
+      <div class="text-gray-100 absolute">
+        <mat-progress-spinner
+          class="place-self-center"
+          [diameter]="56"
+          mode="determinate"
+          [value]="100"
+        ></mat-progress-spinner>
+      </div>
+      <div class="text-primary absolute">
+        <mat-progress-spinner
+          class="place-self-center"
+          [diameter]="56"
+          mode="determinate"
+          [value]="uploadProgress"
+        ></mat-progress-spinner>
+      </div>
+      <span class="text-sm text-main font-bold">{{ uploadProgress }}%</span>
+    </div>
+    <div class="flex flex-col items-center gap-1">
+      <p class="font-medium">
+        {{ getPrimaryText() | translate: { sizeMB: maxSizeMB.toFixed(0) } }}
+      </p>
+      <p
+        class="text-sm"
+        [class]="
+          isUploadInProgress
+            ? 'font-bold text-primary cursor-pointer'
+            : 'font-medium text-gray-500'
+        "
+        (click)="handleSecondaryTextClick($event)"
+      >
+        {{ getSecondaryText() | translate }}
+      </p>
+    </div>
+    <p class="w-full flex flex-row items-center justify-stretch gap-[16px]">
+      <span class="border-b border-gray-300 grow"></span>
+      <span class="text-sm font-medium text-gray-500 or-input-url" translate>
+        input.file.orInputUrl</span
+      >
+      <span class="border-b border-gray-300 grow"></span>
+    </p>
+    <input
+      type="file"
+      class="hidden"
+      (change)="handleFileInput($event)"
+      [disabled]="isUploadInProgress"
+    />
+
+    <gn-ui-url-input
+      class="w-full"
+      [disabled]="isUploadInProgress"
+      (valueChange)="handleUrlChange($event)"
+    ></gn-ui-url-input>
+  </label>
+</div>

package/src/libs/ui/inputs/src/lib/file-input/file-input.component.ts

@@ -0,0 +1,92 @@
+import { CommonModule } from '@angular/common'
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core'
+import { MatIconModule } from '@angular/material/icon'
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
+import { ButtonComponent } from '../button/button.component'
+import { FilesDropDirective } from '../files-drop/files-drop.directive'
+import { TranslateModule } from '@ngx-translate/core'
+import { marker } from '@biesbjerg/ngx-translate-extract-marker'
+import { UrlInputComponent } from '../url-input/url-input.component'
+
+@Component({
+  selector: 'gn-ui-file-input',
+  templateUrl: './file-input.component.html',
+  styleUrls: ['./file-input.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CommonModule,
+    ButtonComponent,
+    MatIconModule,
+    FilesDropDirective,
+    MatProgressSpinnerModule,
+    TranslateModule,
+    UrlInputComponent,
+  ],
+})
+export class FileInputComponent {
+  @Input() maxSizeMB: number
+  @Input() uploadProgress?: number
+  @Output() fileChange: EventEmitter<File> = new EventEmitter()
+  @Output() urlChange: EventEmitter<string> = new EventEmitter()
+  @Output() uploadCancel: EventEmitter<void> = new EventEmitter()
+
+  dragFilesOver = false
+
+  get isUploadInProgress() {
+    return this.uploadProgress !== undefined
+  }
+
+  constructor(private cd: ChangeDetectorRef) {}
+
+  getPrimaryText() {
+    if (this.uploadProgress) {
+      return marker('input.file.uploadProgressLabel')
+    }
+    return marker('input.file.selectFileLabel')
+  }
+
+  getSecondaryText() {
+    if (this.uploadProgress) {
+      return marker('input.file.uploadProgressCancel')
+    }
+    return marker('input.file.dropFileLabel')
+  }
+
+  handleDragFilesOver(dragFilesOver: boolean) {
+    this.dragFilesOver = dragFilesOver
+    this.cd.markForCheck()
+  }
+
+  handleDropFiles(files: File[]) {
+    if (files.length > 0) {
+      this.fileChange.emit(files[0])
+    }
+  }
+
+  handleFileInput(event: Event) {
+    this.handleDropFiles(Array.from((event.target as HTMLInputElement).files))
+  }
+
+  handleUrlChange(url: string) {
+    this.urlChange.emit(url)
+  }
+
+  handleSecondaryTextClick(event: Event) {
+    if (this.uploadProgress) {
+      this.handleCancel()
+      event.preventDefault()
+    }
+  }
+
+  handleCancel() {
+    this.uploadCancel.emit()
+  }
+}

package/src/libs/ui/inputs/src/lib/image-input/image-input.component.html

@@ -19,14 +19,12 @@
         <mat-icon class="material-symbols-outlined">delete</mat-icon>
       </gn-ui-button>
     </div>
-    <input
+    <gn-ui-text-input
       *ngIf="showAltTextInput"
-      type="text"
-      class="py-3 px-2 border-2 border-gray-300 rounded-lg text-sm font-medium"
       [placeholder]="'input.image.altTextPlaceholder' | translate"
-      [value]="altText"
-      (change)="handleAltTextChange($event)"
-    />
+      [value]="altText ?? ''"
+      (valueChange)="handleAltTextChange($event)"
+    ></gn-ui-text-input>
     <div class="flex flex-row gap-2">
       <gn-ui-button
         [extraClass]="'bg-gray-200 font-bold'"
@@ -51,50 +49,70 @@
   <div class="w-full h-full flex flex-col gap-2">
     <label
       gnUiFilesDrop
-      class="block flex-1 border-2 border-dashed border-gray-300 rounded-lg p-6 flex flex-col items-center justify-center gap-4"
+      class="flex-1 border-2 border-dashed rounded-lg p-6 flex flex-col items-center justify-center gap-4"
+      [ngClass]="{
+        'border-primary-lighter bg-primary-white': dragFilesOver,
+        'border-gray-300': !dragFilesOver
+      }"
       (dragFilesOver)="handleDragFilesOver($event)"
       (dropFiles)="handleDropFiles($event)"
     >
-      <div class="w-14 h-14 rounded-md bg-gray-200 grid">
+      <div
+        class="w-14 h-14 rounded-md bg-gray-50 grid"
+        *ngIf="!isUploadInProgress && !uploadError"
+      >
         <mat-icon
-          *ngIf="!dragFilesOver && !uploadProgress && !uploadError"
-          class="material-symbols-outlined place-self-center text-blue-500"
+          *ngIf="!dragFilesOver"
+          class="material-symbols-outlined place-self-center text-primary"
           >image</mat-icon
         >
         <mat-icon
-          *ngIf="dragFilesOver && !uploadProgress && !uploadError"
-          class="material-symbols-outlined place-self-center text-blue-500"
+          *ngIf="dragFilesOver"
+          class="material-symbols-outlined place-self-center text-primary"
           >add_box</mat-icon
         >
-        <div *ngIf="uploadProgress">
+      </div>
+
+      <div
+        *ngIf="isUploadInProgress && !uploadError"
+        class="w-14 h-14 grid items-center justify-center"
+      >
+        <div class="text-gray-100 absolute">
+          <mat-progress-spinner
+            class="place-self-center"
+            [diameter]="56"
+            mode="determinate"
+            [value]="100"
+          ></mat-progress-spinner>
+        </div>
+        <div class="text-primary absolute">
           <mat-progress-spinner
             class="place-self-center"
             [diameter]="56"
-            [mode]="'determinate'"
+            mode="determinate"
             [value]="uploadProgress"
           ></mat-progress-spinner>
-          <span
-            class="text-sm font-medium relative inline-block width-[30px] bottom-[40px] left-[15px]"
-          >
-            {{ uploadProgress }}%
-          </span>
         </div>
+        <span class="text-sm text-main font-bold">{{ uploadProgress }}%</span>
+      </div>
+
+      <div class="w-14 h-14 rounded-md bg-gray-50 grid" *ngIf="uploadError">
         <mat-icon
-          *ngIf="uploadError"
           class="material-symbols-outlined place-self-center text-rose-500"
           >broken_image</mat-icon
         >
       </div>
+
       <div class="flex flex-col items-center gap-1">
         <p class="font-medium">{{ getPrimaryText() | translate }}</p>
         <p
           class="text-sm"
           [class]="
-            uploadProgress || uploadError
+            isUploadInProgress || uploadError
               ? 'font-bold text-blue-500 cursor-pointer'
               : 'font-medium text-gray-500'
           "
-          (click)="handleSecondaryTextClick()"
+          (click)="handleSecondaryTextClick($event)"
         >
           {{ getSecondaryText() | translate }}
         </p>
@@ -103,9 +121,10 @@
         type="file"
         class="hidden"
         (change)="handleFileInput($event)"
-        [disabled]="showUrlInput || uploadProgress || uploadError"
+        [disabled]="showUrlInput || isUploadInProgress || uploadError"
       />
     </label>
+
     <div *ngIf="!showUrlInput" class="flex-none">
       <gn-ui-button
         [extraClass]="'bg-gray-200 font-bold'"
@@ -115,32 +134,13 @@
         {{ 'input.image.displayUrlInput' | translate }}
       </gn-ui-button>
     </div>
-    <div *ngIf="showUrlInput" class="flex-none flex flex-col gap-2">
-      <div class="h-2"></div>
-      <div class="flex gap-2 items-center">
-        <div class="flex-1 flex rounded-lg">
-          <span
-            class="material-symbols-outlined px-4 inline-flex items-center min-w-fit rounded-s-lg border-2 border-e-0 border-gray-300"
-            >link</span
-          >
-          <input
-            type="text"
-            class="py-3 ps-1 block w-full border-2 border-s-0 border-e-0 border-gray-300 text-sm font-medium"
-            placeholder="https://exemple.com/image.jpg"
-            (change)="handleUrlChange($event)"
-          />
-          <gn-ui-button
-            class="px-1 inline-flex items-center min-w-fit rounded-e-lg border-2 border-s-0 border-gray-300 text-white"
-            [extraClass]="
-              urlInputValue && !downloadError ? 'bg-blue-500' : 'bg-gray-500'
-            "
-            [disabled]="!urlInputValue || downloadError"
-            (buttonClick)="downloadUrl()"
-          >
-            <mat-icon class="material-symbols-outlined">arrow_upward</mat-icon>
-          </gn-ui-button>
-        </div>
-      </div>
-    </div>
+
+    <gn-ui-url-input
+      *ngIf="showUrlInput"
+      class="mt-3.5"
+      (valueChange)="downloadUrl($event)"
+      [disabled]="isUploadInProgress"
+    >
+    </gn-ui-url-input>
   </div>
 </ng-template>