geonetwork-ui 2.5.0-dev.a16ba6619 → 2.5.0-dev.a89d8b5db

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

@@ -14,7 +14,11 @@
       [disabled]="true"
     ></gn-ui-text-input>
     <div class="flex flex-row gap-2 mt-2">
-      <gn-ui-button type="gray" (buttonClick)="handleDelete()">
+      <gn-ui-button
+        type="gray"
+        (buttonClick)="handleDelete()"
+        data-cy="delete-image"
+      >
         <ng-icon class="me-1 text-primary" name="iconoirBin"></ng-icon>
         {{ 'input.image.delete' | translate }}
       </gn-ui-button>
@@ -38,20 +42,17 @@
       [ngClass]="{
         'border-primary-lighter bg-primary-white': dragFilesOver,
         'border-gray-300': !dragFilesOver,
-        'cursor-pointer hover:border-gray-500':
-          !isUploadInProgress && !uploadError && !showUrlInput && !disabled,
+        'cursor-pointer hover:border-gray-500': !getIsActionBlocked(),
         'cursor-not-allowed': disabled,
       }"
-      [attr.tabindex]="
-        isUploadInProgress || uploadError || showUrlInput || disabled ? null : 0
-      "
+      [attr.tabindex]="getIsActionBlocked() ? null : 0"
       (keydown.enter)="fileInput.click()"
       (dragFilesOver)="handleDragFilesOver($event)"
       (dropFiles)="handleDropFiles($event)"
     >
       <div
         class="w-14 h-14 rounded-md bg-gray-50 grid"
-        *ngIf="!isUploadInProgress && !uploadError"
+        *ngIf="!isUploadInProgress && !imageFileError"
       >
         <ng-icon
           *ngIf="!dragFilesOver"
@@ -66,7 +67,7 @@
       </div>
 
       <div
-        *ngIf="isUploadInProgress && !uploadError"
+        *ngIf="isUploadInProgress && !imageFileError"
         class="w-14 h-14 grid items-center justify-center relative"
       >
         <div class="text-gray-100 absolute">
@@ -88,19 +89,23 @@
         <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">
+      <div class="w-14 h-14 rounded-md bg-gray-50 grid" *ngIf="imageFileError">
         <ng-icon
           name="iconoirMediaImageXmark"
           class="place-self-center text-rose-500"
+          data-cy="imgErrorIcon"
         ></ng-icon>
       </div>
 
       <div class="flex flex-col items-center gap-1">
-        <p class="font-medium">{{ getPrimaryText() | translate }}</p>
+        <p class="font-medium" data-cy="imgInputMsgPrimary">
+          {{ getPrimaryText() | translate }}
+        </p>
         <p
           class="text-sm"
+          data-cy="imgInputMsgSecondary"
           [class]="
-            isUploadInProgress || uploadError
+            isUploadInProgress
               ? 'font-bold text-blue-500 cursor-pointer'
               : 'font-medium text-gray-500'
           "
@@ -111,17 +116,17 @@
       </div>
       <input
         #fileInput
+        accept="image/*"
         type="file"
         class="hidden"
         (change)="handleFileInput($event)"
-        [disabled]="
-          showUrlInput || isUploadInProgress || uploadError || disabled
-        "
+        [disabled]="isUploadInProgress || disabled"
       />
     </label>
 
     <div *ngIf="!showUrlInput" class="flex-none mt-2">
       <gn-ui-button
+        data-cy="imgUrlBtn"
         (buttonClick)="displayUrlInput()"
         type="gray"
         [disabled]="disabled"
@@ -135,6 +140,7 @@
     <gn-ui-url-input
       *ngIf="showUrlInput"
       class="mt-3.5"
+      data-cy="imgUrlInput"
       (uploadClick)="downloadUrl($event)"
       [disabled]="isUploadInProgress || disabled"
     >

package/src/libs/ui/elements/src/lib/image-input/image-input.component.ts

@@ -80,12 +80,9 @@ export class ImageInputComponent {
 
   dragFilesOver = false
   showUrlInput = false
-  downloadError = false
+  imageFileError = this.uploadError
   showAltTextInput = false
 
-  lastUploadType?: 'file' | 'url'
-  lastUploadContent?: string | File
-
   get isUploadInProgress() {
     return this.uploadProgress !== undefined
   }
@@ -95,8 +92,12 @@ export class ImageInputComponent {
     private cd: ChangeDetectorRef
   ) {}
 
+  getIsActionBlocked() {
+    return this.isUploadInProgress || this.disabled
+  }
+
   getPrimaryText() {
-    if (this.uploadError) {
+    if (this.imageFileError) {
       return marker('input.image.uploadErrorLabel')
     }
     if (this.uploadProgress) {
@@ -106,8 +107,8 @@ export class ImageInputComponent {
   }
 
   getSecondaryText() {
-    if (this.uploadError) {
-      return marker('input.image.uploadErrorRetry')
+    if (this.imageFileError) {
+      return '\u00A0' // (only to keep same spacing, next step is to handle "Retry")
     }
     if (this.uploadProgress) {
       return marker('input.image.uploadProgressCancel')
@@ -123,19 +124,24 @@ export class ImageInputComponent {
   }
 
   handleDropFiles(files: File[]) {
-    if (!this.showUrlInput) {
-      const validFiles = this.filterTypeImage(files)
-      if (validFiles.length > 0) {
-        this.resizeAndEmit(validFiles[0])
-      }
+    this.resetErrors()
+    const validFiles = this.filterTypeImage(files)
+    if (validFiles.length > 0) {
+      this.showUrlInput = false
+      this.resizeAndEmit(validFiles[0])
+    } else {
+      this.imageFileError = true
     }
   }
 
   handleFileInput(event: Event) {
+    this.resetErrors()
     const inputFiles = Array.from((event.target as HTMLInputElement).files)
     const validFiles = this.filterTypeImage(inputFiles)
     if (validFiles.length > 0) {
       this.resizeAndEmit(validFiles[0])
+    } else {
+      this.imageFileError = true
     }
   }
 
@@ -145,9 +151,8 @@ export class ImageInputComponent {
   }
 
   async downloadUrl(url: string) {
-    this.downloadError = false
+    this.resetErrors()
     const name = url.split('/').pop()
-
     try {
       const response = await firstValueFrom(
         this.http.head(url, { observe: 'response' })
@@ -164,47 +169,39 @@ export class ImageInputComponent {
             this.fileChange.emit(file)
           },
           error: () => {
-            this.downloadError = true
+            this.imageFileError = true
             this.cd.markForCheck()
             this.urlChange.emit(url)
           },
         })
       }
     } catch {
-      this.downloadError = true
+      this.imageFileError = true
       this.cd.markForCheck()
       return
     }
   }
 
   handleSecondaryTextClick(event: Event) {
-    if (this.uploadError) {
-      this.handleRetry()
-    } else if (this.uploadProgress) {
-      this.handleCancel()
+    if (this.uploadProgress) {
+      this.handleCancelUpload()
       event.preventDefault()
     }
   }
 
-  handleCancel() {
+  handleCancelUpload() {
     this.uploadCancel.emit()
   }
 
-  handleRetry() {
-    switch (this.lastUploadType) {
-      case 'file':
-        this.fileChange.emit(this.lastUploadContent as File)
-        break
-      case 'url':
-        this.urlChange.emit(this.lastUploadContent as string)
-        break
-    }
-  }
-
   handleDelete() {
     this.delete.emit()
   }
 
+  resetErrors() {
+    this.imageFileError = false
+    this.uploadError = false
+  }
+
   toggleAltTextInput() {
     this.showAltTextInput = !this.showAltTextInput
   }

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

@@ -1,4 +1,4 @@
-import { Component, Input, ChangeDetectionStrategy } from '@angular/core'
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
 import { marked } from 'marked'
 
 @Component({
@@ -13,6 +13,6 @@ export class MarkdownParserComponent {
   @Input() whitoutStyles?: boolean
 
   get parsedMarkdown() {
-    return marked.parse(this.textContent)
+    return marked.parse(this.textContent ?? '')
   }
 }

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

@@ -1,13 +1,25 @@
 <div *ngIf="metadataQualityDisplay" class="mb-6 metadata-quality">
-  <gn-ui-popover [content]="popoverItems" theme="light-border">
-    <div class="min-w-[200px]" [class]="smaller ? 'leading-[8px]' : ''">
-      <gn-ui-progress-bar
-        tabindex="0"
-        [value]="qualityScore"
-        type="primary"
-      ></gn-ui-progress-bar>
-    </div>
-  </gn-ui-popover>
+  <div
+    class="flex items-center"
+    [class]="smaller ? 'leading-[8px] min-w-[120px]' : 'min-w-[200px]'"
+  >
+    <gn-ui-progress-bar
+      tabindex="0"
+      [value]="qualityScore"
+      [type]="'light'"
+      class="flex-grow"
+    ></gn-ui-progress-bar>
+    <gn-ui-popover
+      [content]="popoverItems"
+      theme="light-border"
+      [class]="smaller ? 'ml-2' : 'ml-2 mt-1'"
+    >
+      <ng-icon
+        name="matInfoOutline"
+        class="flex-shrink-0 text-gray-600"
+      ></ng-icon>
+    </gn-ui-popover>
+  </div>
 </div>
 <ng-template #popoverItems>
   <div class="p-2 py-4">

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

@@ -16,6 +16,9 @@ import {
 } from '../../../../../../libs/ui/widgets/src'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { NgIcon } from '@ng-icons/core'
+import { matInfoOutline } from '@ng-icons/material-icons/outline'
+import { provideIcons, provideNgIconsConfig } from '@ng-icons/core'
 
 @Component({
   selector: 'gn-ui-metadata-quality',
@@ -29,6 +32,16 @@ import { TranslateModule } from '@ngx-translate/core'
     ProgressBarComponent,
     MetadataQualityItemComponent,
     TranslateModule,
+    NgIcon,
+  ],
+  providers: [
+    provideIcons({
+      matInfoOutline,
+    }),
+    provideNgIconsConfig({
+      size: '1.2em',
+      strokeWidth: '1.5px',
+    }),
   ],
 })
 export class MetadataQualityComponent implements OnChanges {

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

@@ -3,7 +3,6 @@ export * from './lib/badge/badge.component'
 export * from './lib/button/button.component'
 export * from './lib/check-toggle/check-toggle.component'
 export * from './lib/checkbox/checkbox.component'
-export * from './lib/chips-input/chips-input.component'
 export * from './lib/copy-text-button/copy-text-button.component'
 export * from './lib/date-picker/date-picker.component'
 export * from './lib/date-range-dropdown/date-range-dropdown.component'

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

@@ -5,31 +5,48 @@
   >
     <ng-icon name="iconoirSearch" class="text-primary search"></ng-icon>
   </div>
-  <input
-    #searchInput
-    type="text"
-    class="gn-ui-text-input"
-    [ngClass]="{
-      'px-[--icon-width]': !allowSubmit,
-    }"
-    [placeholder]="placeholder"
-    [formControl]="control"
-    [matAutocomplete]="auto"
-    (keyup.enter)="handleEnter(searchInput.value)"
-  />
+  <div class="flex flex-row">
+    <input
+      #searchInput
+      type="text"
+      class="gn-ui-text-input"
+      (input)="handleInput($event)"
+      [placeholder]="placeholder"
+      [formControl]="control"
+      [matAutocomplete]="auto"
+      (keyup.enter)="handleEnter(searchInput.value)"
+      [ngClass]="{
+        'text-primary': searchActive && enterButton,
+        'text-gray-900': !searchActive,
+        'px-[--icon-width]': !allowSubmit,
+      }"
+    />
+    <gn-ui-button
+      type="gray"
+      *ngIf="searchInput.value && displayEnterBtn"
+      extraClass="w-32 h-8 !opacity-100"
+      [ngStyle]="{ left: enterBtnPosition + 'px' }"
+      class="absolute"
+      disabled="true"
+    >
+      <ng-icon
+        name="iconoirLongArrowDownLeft"
+        class="!w-4 text-gray-900 font-bold"
+      ></ng-icon>
+      <span translate class="text-bold text-gray-900 font-bold">
+        Enter to search
+      </span>
+    </gn-ui-button>
+  </div>
   <gn-ui-button
-    type="light"
-    extraClass="border-0 text-primary-lightest hover:text-primary focus:text-primary absolute inset-y-[--icon-padding] {{
-      allowSubmit
-        ? 'right-[calc(var(--icon-width)+var(--icon-padding))]'
-        : 'right-[--icon-padding]'
-    }}"
+    type="primary"
+    [extraClass]="getExtraClass()"
     data-test="clear-btn"
     *ngIf="searchInput.value"
     aria-label="Clear"
     (buttonClick)="clear()"
   >
-    <ng-icon name="matClose"></ng-icon>
+    <ng-icon class="text-white" name="matClose"></ng-icon>
   </gn-ui-button>
   <gn-ui-button
     type="light"

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

@@ -41,7 +41,7 @@ import {
   provideIcons,
   provideNgIconsConfig,
 } from '@ng-icons/core'
-import { iconoirSearch } from '@ng-icons/iconoir'
+import { iconoirLongArrowDownLeft, iconoirSearch } from '@ng-icons/iconoir'
 import { matClose } from '@ng-icons/material-icons/baseline'
 
 export type AutocompleteItem = unknown
@@ -65,9 +65,10 @@ export type AutocompleteItem = unknown
     provideIcons({
       iconoirSearch,
       matClose,
+      iconoirLongArrowDownLeft,
     }),
     provideNgIconsConfig({
-      size: '1.5rem',
+      size: '1.75rem',
     }),
   ],
 })
@@ -75,6 +76,7 @@ export class AutocompleteComponent
   implements OnInit, AfterViewInit, OnDestroy, OnChanges
 {
   @Input() placeholder: string
+  @Input() enterButton = false
   @Input() action: (value: string) => Observable<AutocompleteItem[]>
   @Input() value?: AutocompleteItem
   @Input() clearOnSelection = false
@@ -83,9 +85,11 @@ export class AutocompleteComponent
   @Input() minCharacterCount? = 3
   // this will show a submit button next to the input; if false, a search icon will appear on the left
   @Input() allowSubmit = false
+  @Input() forceTrackPosition = false
   @Output() itemSelected = new EventEmitter<AutocompleteItem>()
   @Output() inputSubmitted = new EventEmitter<string>()
   @Output() inputCleared = new EventEmitter<void>()
+  @Output() isSearchActive = new EventEmitter<boolean>()
   @ViewChild(MatAutocompleteTrigger) triggerRef: MatAutocompleteTrigger
   @ViewChild(MatAutocomplete) autocomplete: MatAutocomplete
   @ViewChild('searchInput') inputRef: ElementRef<HTMLInputElement>
@@ -98,15 +102,38 @@ export class AutocompleteComponent
   error: string | null = null
   suggestions$: Observable<AutocompleteItem[]>
   subscription = new Subscription()
+  private lastPosition: DOMRect | null = null
+  private intervalIdPosition: number | undefined
+  enterBtnPosition = 0
+  searchActive = false
 
   @Input() displayWithFn: (item: AutocompleteItem) => string = (item) =>
     item.toString()
 
+  get displayEnterBtn() {
+    return this.enterButton && this.allowSubmit && !this.searchActive
+  }
+
   displayWithFnInternal = (item?: AutocompleteItem) => {
     if (item === null || item === undefined) return null
     return this.displayWithFn(item)
   }
 
+  getExtraClass(): string {
+    if (this.allowSubmit) {
+      if (this.enterButton) {
+        return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+var(--icon-padding))] inset-y-[--icon-padding]'
+      } else {
+        return 'border rounded-lg absolute w-8 h-8 right-[calc(var(--icon-width)+0.25*var(--icon-width))] inset-y-[calc(0.25*var(--icon-width))]'
+      }
+    } else {
+      if (!this.enterButton) {
+        return 'border rounded-lg absolute w-8 h-8 right-2 inset-y-2'
+      }
+    }
+    return 'border rounded-lg absolute w-8 h-8'
+  }
+
   constructor(private cdRef: ChangeDetectorRef) {}
   ngOnChanges(changes: SimpleChanges): void {
     const { value } = changes
@@ -114,6 +141,13 @@ export class AutocompleteComponent
       const previousTextValue = this.displayWithFnInternal(value.previousValue)
       const currentTextValue = this.displayWithFnInternal(value.currentValue)
       if (previousTextValue !== currentTextValue) {
+        if (currentTextValue) {
+          this.searchActive = true
+          this.isSearchActive.emit(true)
+        } else {
+          this.searchActive = false
+          this.isSearchActive.emit(false)
+        }
         this.updateInputValue(value.currentValue)
       }
     }
@@ -197,10 +231,49 @@ export class AutocompleteComponent
       this.inputRef.nativeElement.focus()
       this.cdRef.detectChanges()
     }
+
+    this.startTrackingPosition()
+  }
+
+  /**
+   * !!! This function is used only for web component mode,
+   * the autocomplete dropdown may not update its position
+   * if the page or container is disabling wind scroll.
+   */
+  private trackPosition = () => {
+    const dropdownOpened = this.triggerRef && this.triggerRef.panelOpen
+    const rect = this.inputRef.nativeElement.getBoundingClientRect()
+
+    if (
+      dropdownOpened &&
+      (!this.lastPosition ||
+        rect.top !== this.lastPosition.top ||
+        rect.left !== this.lastPosition.left)
+    ) {
+      this.triggerRef.updatePosition()
+    }
+
+    this.lastPosition = rect
+    requestAnimationFrame(this.trackPosition)
+  }
+
+  /**
+   * !!! This function is used only for web component mode,
+   * the autocomplete dropdown may not update its position
+   * if the page or container is disabling wind scroll.
+   */
+  startTrackingPosition() {
+    if (this.forceTrackPosition) {
+      requestAnimationFrame(this.trackPosition)
+    }
   }
 
   ngOnDestroy(): void {
     this.subscription?.unsubscribe()
+
+    if (this.intervalIdPosition) {
+      clearInterval(this.intervalIdPosition)
+    }
   }
 
   updateInputValue(value: AutocompleteItem) {
@@ -214,6 +287,8 @@ export class AutocompleteComponent
 
   clear(): void {
     this.inputRef.nativeElement.value = ''
+    this.searchActive = false
+    this.isSearchActive.emit(false)
     this.inputCleared.emit()
     this.selectionSubject
       .pipe(take(1))
@@ -223,6 +298,8 @@ export class AutocompleteComponent
 
   handleEnter(any: string) {
     if (!this.cancelEnter && this.allowSubmit) {
+      this.isSearchActive.emit(true)
+      this.searchActive = true
       this.inputSubmitted.emit(any)
     }
   }
@@ -252,4 +329,10 @@ export class AutocompleteComponent
       this.control.setValue('')
     }
   }
+
+  handleInput(event: InputEvent) {
+    this.searchActive = false
+    this.isSearchActive.emit(false)
+    this.enterBtnPosition = event.target['value'].length * 8 + 80
+  }
 }

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

@@ -28,7 +28,6 @@ import { BadgeComponent } from './badge/badge.component'
 import { ButtonComponent } from './button/button.component'
 import { CheckToggleComponent } from './check-toggle/check-toggle.component'
 import { CheckboxComponent } from './checkbox/checkbox.component'
-import { ChipsInputComponent } from './chips-input/chips-input.component'
 import { DateRangePickerComponent } from './date-range-picker/date-range-picker.component'
 import { DragAndDropFileInputComponent } from './drag-and-drop-file-input/drag-and-drop-file-input.component'
 import { DropdownMultiselectComponent } from './dropdown-multiselect/dropdown-multiselect.component'
@@ -40,7 +39,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
 @NgModule({
   declarations: [
     DragAndDropFileInputComponent,
-    ChipsInputComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
     CheckboxComponent,
@@ -86,7 +84,6 @@ import { ViewportIntersectorComponent } from './viewport-intersector/viewport-in
     ButtonComponent,
     DragAndDropFileInputComponent,
     TextAreaComponent,
-    ChipsInputComponent,
     DropdownMultiselectComponent,
     ViewportIntersectorComponent,
     CheckToggleComponent,

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

@@ -48,6 +48,7 @@ export class UrlInputComponent implements OnChanges {
   @Input() placeholder = 'https://'
   @Input() disabled: boolean
   @Input() showValidateButton = true
+  @Input() resetUrlOnChange: number
 
   /**
    * This will emit null if the field is emptied
@@ -60,8 +61,8 @@ export class UrlInputComponent implements OnChanges {
   constructor(private cd: ChangeDetectorRef) {}
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes['value']) {
-      this.inputValue = changes['value'].currentValue
+    if (changes['resetUrlOnChange']) {
+      this.inputValue = ''
     }
   }
 

package/src/libs/ui/search/src/lib/record-preview-row/record-preview-row.component.html

@@ -64,7 +64,7 @@
       class="col-start-2 row-start-4 sm:row-start-3 absolute right-[4em] sm:right-[5em]"
     >
       <gn-ui-metadata-quality
-        smaller="true"
+        [smaller]="true"
         [metadata]="record"
         [metadataQualityDisplay]="metadataQualityDisplay"
       ></gn-ui-metadata-quality>

package/src/libs/ui/search/src/lib/results-table/action-menu/action-menu.component.html

@@ -6,6 +6,7 @@
     >
       <ul class="flex flex-col gap-2 w-full">
         <gn-ui-button
+          *ngIf="!isDraftPage"
           type="light"
           extraClass="flex flex-row items-center gap-2 w-full justify-start"
           (buttonClick)="duplicate.emit()"
@@ -23,7 +24,10 @@
           (buttonClick)="displayDeleteMenu()"
           [disabled]="!canDelete"
           data-test="record-menu-delete-button"
-          ><span translate>record.action.delete</span></gn-ui-button
+          ><span *ngIf="!isDraftPage" translate>record.action.delete</span>
+          <span *ngIf="isDraftPage" translate
+            >record.action.rollback</span
+          ></gn-ui-button
         >
       </ul>
     </div>
@@ -60,4 +64,36 @@
       </div>
     </div>
   </ng-container>
+  <ng-container *ngSwitchCase="'rollbackMenu'">
+    <div
+      data-test="rollbackMenuSection"
+      class="w-80 p-6 flex flex-col gap-3 mt-2 border border-gray-100 bg-white shadow-2xl rounded-2xl"
+    >
+      <span class="text-lg font-bold text-center">{{
+        'editor.record.undo.confirmation.title' | translate
+      }}</span>
+      <span class="text-center">{{
+        'editor.record.undo.confirmation.message' | translate
+      }}</span>
+      <div class="flex flex-row gap-8 justify-center">
+        <gn-ui-button
+          (buttonClick)="rollback.emit()"
+          cdkFocusInitial
+          type="primary"
+          data-cy="confirm-button"
+          [style.--gn-ui-button-width]="'120px'"
+          >{{
+            'editor.record.undo.confirmation.confirmText' | translate
+          }}</gn-ui-button
+        >
+        <gn-ui-button
+          [style.--gn-ui-button-width]="'120px'"
+          (buttonClick)="closeActionMenu.emit()"
+          >{{
+            'editor.record.undo.confirmation.cancelText' | translate
+          }}</gn-ui-button
+        >
+      </div>
+    </div>
+  </ng-container>
 </ng-container>