geonetwork-ui 2.5.0-dev.59720aa72 → 2.5.0-dev.5d0c263b8

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

@@ -66,9 +66,22 @@ import { ImageOverlayPreviewComponent } from '../image-overlay-preview/image-ove
   ],
 })
 export class ImageInputComponent {
-  @Input() maxSizeMB: number
+  private _altText?: string
+
   @Input() previewUrl?: string
-  @Input() altText?: string
+  @Input()
+  get altText(): string | undefined {
+    return this._altText
+  }
+  set altText(value: string | undefined) {
+    if (value !== 'KO' && this._altText === 'KO') {
+      //This is a dataset rollback after upload error
+      this.resetErrors()
+    }
+    this._altText = value
+  }
+
+  @Input() maxSizeMB: number
   @Input() uploadProgress?: number
   @Input() uploadError?: boolean
   @Input() disabled?: boolean = false
@@ -80,11 +93,9 @@ export class ImageInputComponent {
 
   dragFilesOver = false
   showUrlInput = false
-  downloadError = false
+  imageFileError = this.uploadError
   showAltTextInput = false
-
-  lastUploadType?: 'file' | 'url'
-  lastUploadContent?: string | File
+  pendingAltText: string
 
   get isUploadInProgress() {
     return this.uploadProgress !== undefined
@@ -95,8 +106,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 +121,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,18 +138,26 @@ export class ImageInputComponent {
   }
 
   handleDropFiles(files: File[]) {
+    this.resetErrors()
     const validFiles = this.filterTypeImage(files)
     if (validFiles.length > 0) {
       this.showUrlInput = false
       this.resizeAndEmit(validFiles[0])
+    } else {
+      this.imageFileError = true
+      this.handleAltTextChange('KO')
     }
   }
 
   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
+      this.handleAltTextChange('KO')
     }
   }
 
@@ -144,7 +167,7 @@ export class ImageInputComponent {
   }
 
   async downloadUrl(url: string) {
-    this.downloadError = false
+    this.resetErrors()
     const name = url.split('/').pop()
     try {
       const response = await firstValueFrom(
@@ -162,47 +185,41 @@ export class ImageInputComponent {
             this.fileChange.emit(file)
           },
           error: () => {
-            this.downloadError = true
+            this.imageFileError = true
+            this.handleAltTextChange('KO')
             this.cd.markForCheck()
             this.urlChange.emit(url)
           },
         })
       }
     } catch {
-      this.downloadError = true
+      this.imageFileError = true
+      this.handleAltTextChange('KO')
       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
   }
@@ -210,7 +227,6 @@ export class ImageInputComponent {
   handleAltTextChange(altText: string) {
     this.altTextChange.emit(altText)
   }
-
   private filterTypeImage(files: File[]) {
     return files.filter((file) => {
       return file.type.startsWith('image/')

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/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
@@ -87,6 +89,7 @@ export class AutocompleteComponent
   @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>
@@ -101,15 +104,36 @@ export class AutocompleteComponent
   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
@@ -117,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)
       }
     }
@@ -256,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))
@@ -265,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)
     }
   }
@@ -294,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/url-input/url-input.component.ts

@@ -31,7 +31,7 @@ import { iconoirArrowUp, iconoirLink } from '@ng-icons/iconoir'
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UrlInputComponent {
+export class UrlInputComponent implements OnChanges {
   @Input() set value(v: string) {
     // we're making sure to only update the input if the URL representation of it has changed; otherwise we keep it identical
     // to avoid glitches when starting to write a URL and having some characters added/replaced automatically
@@ -48,6 +48,7 @@ export class UrlInputComponent {
   @Input() placeholder = 'https://'
   @Input() disabled: boolean
   @Input() showValidateButton = true
+  @Input() resetUrlOnChange: number
 
   /**
    * This will emit null if the field is emptied
@@ -59,6 +60,12 @@ export class UrlInputComponent {
 
   constructor(private cd: ChangeDetectorRef) {}
 
+  ngOnChanges(changes: SimpleChanges) {
+    if (changes['resetUrlOnChange']) {
+      this.inputValue = ''
+    }
+  }
+
   handleInput(event: Event) {
     const value = (event.target as HTMLInputElement).value
     this.inputValue = value

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/widgets/src/lib/progress-bar/progress-bar.component.html

@@ -1,12 +1,37 @@
-<div class="flex h-full {{ color.outerBar }} rounded-t-lg rounded-b-lg">
-  <div
-    [style.width.%]="progress"
-    class="flex {{
-      color.innerBar
-    }} my-1 mx-1 transition-width duration-500 ease-in-out rounded-t-md rounded-b-md shadow-xl"
-  >
-    <div class="flex items-center pl-2 py-1 {{ color.text }} font-bold text-4">
-      {{ progress }}%
+<ng-container [ngSwitch]="type">
+  <!-- Light Theme -->
+  <ng-container *ngSwitchCase="'light'">
+    <div class="flex items-center relative">
+      <div
+        class="flex-shrink-0 {{ color.text }} text-xs font-medium mr-2
+             text-opacity-100 !text-slate-800"
+      >
+        {{ progress }}%
+      </div>
+      <div class="flex-grow h-[6px] w-full {{ color.outerBar }} rounded-full">
+        <div
+          [style.width.%]="progress"
+          class="{{ color.innerBar }} transition-width duration-500
+               ease-in-out rounded-full shadow-sm h-full"
+        ></div>
+      </div>
     </div>
-  </div>
-</div>
+  </ng-container>
+
+  <!-- Default / Primary / Secondary Themes -->
+  <ng-container *ngSwitchDefault>
+    <div class="flex h-full {{ color.outerBar }} rounded-t-lg rounded-b-lg">
+      <div
+        [style.width.%]="progress"
+        class="flex {{ color.innerBar }} my-1 mx-1 transition-width
+               duration-500 ease-in-out rounded-t-md rounded-b-md shadow-xl"
+      >
+        <div
+          class="flex items-center pl-2 py-1 {{ color.text }} font-bold text-4"
+        >
+          {{ progress }}%
+        </div>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>

package/src/libs/ui/widgets/src/lib/progress-bar/progress-bar.component.ts

@@ -1,4 +1,5 @@
 import { Component, Input } from '@angular/core'
+import { NgSwitch, NgSwitchCase, NgSwitchDefault } from '@angular/common'
 
 interface ColorScheme {
   outerBar: string
@@ -11,10 +12,11 @@ interface ColorScheme {
   templateUrl: './progress-bar.component.html',
   styleUrls: ['./progress-bar.component.css'],
   standalone: true,
+  imports: [NgSwitch, NgSwitchCase, NgSwitchDefault],
 })
 export class ProgressBarComponent {
   @Input() value = 0
-  @Input() type: 'primary' | 'secondary' | 'default' = 'default'
+  @Input() type: 'primary' | 'secondary' | 'default' | 'light' = 'default'
 
   get progress() {
     return this.value > 0 ? (this.value < 100 ? this.value : 100) : 0
@@ -40,6 +42,12 @@ export class ProgressBarComponent {
           innerBar: 'bg-secondary-lighter',
           text: 'text-white',
         }
+      case 'light':
+        return {
+          outerBar: 'bg-primary-white',
+          innerBar: 'bg-primary',
+          text: 'text-main',
+        }
     }
   }
 }

package/translations/de.json

@@ -472,7 +472,7 @@
   "search.error.receivedError": "Ein Fehler ist aufgetreten",
   "search.error.recordHasnolink": "",
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
-  "search.field.any.placeholder": "Suche Datensätze ...",
+  "search.field.any.placeholder": "Suche im katalog ...",
   "search.field.sortBy": "Sortieren nach:",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",

package/translations/en.json

@@ -472,7 +472,7 @@
   "search.error.receivedError": "An error was received",
   "search.error.recordHasnolink": "This dataset currently has no link yet, please come back later.",
   "search.error.recordNotFound": "The dataset with identifier \"{ id }\" could not be found.",
-  "search.field.any.placeholder": "Search datasets ...",
+  "search.field.any.placeholder": "Search in the catalog ...",
   "search.field.sortBy": "Sort by:",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",

package/translations/fr.json

@@ -472,7 +472,7 @@
   "search.error.receivedError": "Erreur retournée",
   "search.error.recordHasnolink": "Ce jeu de données n'a pas encore de lien, réessayez plus tard s'il vous plaît.",
   "search.error.recordNotFound": "Cette donnée n'a pu être trouvée.",
-  "search.field.any.placeholder": "Rechercher un jeu de données...",
+  "search.field.any.placeholder": "Rechercher dans le catalogue...",
   "search.field.sortBy": "Trier par :",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",

package/translations/it.json

@@ -472,7 +472,7 @@
   "search.error.receivedError": "Errore restituito",
   "search.error.recordHasnolink": "Questo dataset non ha ancora alcun collegamento, riprova più tardi.",
   "search.error.recordNotFound": "Impossibile trovare questi dati.",
-  "search.field.any.placeholder": "Cerca un dataset...",
+  "search.field.any.placeholder": "Cerca del catalogo...",
   "search.field.sortBy": "Ordina per:",
   "search.filters.availableServices.download": "",
   "search.filters.availableServices.view": "",