geonetwork-ui 2.4.0-dev.a9a61288 → 2.4.0-dev.aa689838

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 hover:cursor-pointer"
+      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>

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

@@ -16,7 +16,8 @@ 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 { FormControl, ReactiveFormsModule } from '@angular/forms'
+import { UrlInputComponent } from '../url-input/url-input.component'
+import { TextInputComponent } from '../text-input/text-input.component'
 
 @Component({
   selector: 'gn-ui-image-input',
@@ -31,13 +32,13 @@ import { FormControl, ReactiveFormsModule } from '@angular/forms'
     FilesDropDirective,
     MatProgressSpinnerModule,
     TranslateModule,
-    ReactiveFormsModule,
+    UrlInputComponent,
+    TextInputComponent,
   ],
 })
 export class ImageInputComponent {
-  @Input() formControl!: FormControl
   @Input() maxSizeMB: number
-  @Input() previewUrl?: URL
+  @Input() previewUrl?: string
   @Input() altText?: string
   @Input() uploadProgress?: number
   @Input() uploadError?: boolean
@@ -52,10 +53,13 @@ export class ImageInputComponent {
   downloadError = false
   showAltTextInput = false
 
-  urlInputValue?: string
   lastUploadType?: 'file' | 'url'
   lastUploadContent?: string | File
 
+  get isUploadInProgress() {
+    return this.uploadProgress !== undefined
+  }
+
   constructor(private http: HttpClient, private cd: ChangeDetectorRef) {}
 
   getPrimaryText() {
@@ -107,34 +111,29 @@ export class ImageInputComponent {
     this.showUrlInput = true
   }
 
-  handleUrlChange(event: Event) {
+  async downloadUrl(url: string) {
     this.downloadError = false
-    this.urlInputValue = (event.target as HTMLInputElement).value
-  }
-
-  async downloadUrl() {
-    const name = this.urlInputValue.split('/').pop()
+    const name = url.split('/').pop()
 
     try {
       const response = await firstValueFrom(
-        this.http.head(this.urlInputValue, { observe: 'response' })
+        this.http.head(url, { observe: 'response' })
       )
       if (
         response.headers.get('content-type')?.startsWith('image/') &&
         parseInt(response.headers.get('content-length')) <
           megabytesToBytes(this.maxSizeMB)
       ) {
-        this.http.get(this.urlInputValue, { responseType: 'blob' }).subscribe({
+        this.http.get(url, { responseType: 'blob' }).subscribe({
           next: (blob) => {
             this.cd.markForCheck()
             const file = new File([blob], name)
             this.fileChange.emit(file)
           },
-          error: (error) => {
-            console.error(error)
+          error: () => {
             this.downloadError = true
             this.cd.markForCheck()
-            this.urlChange.emit(this.urlInputValue)
+            this.urlChange.emit(url)
           },
         })
       }
@@ -145,11 +144,12 @@ export class ImageInputComponent {
     }
   }
 
-  handleSecondaryTextClick() {
+  handleSecondaryTextClick(event: Event) {
     if (this.uploadError) {
       this.handleRetry()
     } else if (this.uploadProgress) {
       this.handleCancel()
+      event.preventDefault()
     }
   }
 
@@ -169,7 +169,6 @@ export class ImageInputComponent {
   }
 
   handleDelete() {
-    this.formControl.markAsDirty()
     this.delete.emit()
   }
 
@@ -177,9 +176,8 @@ export class ImageInputComponent {
     this.showAltTextInput = !this.showAltTextInput
   }
 
-  handleAltTextChange(event: Event) {
-    const input = event.target as HTMLInputElement
-    this.altTextChange.emit(input.value)
+  handleAltTextChange(altText: string) {
+    this.altTextChange.emit(altText)
   }
 
   private filterTypeImage(files: File[]) {

package/src/libs/ui/inputs/src/lib/text-area/text-area.component.html

@@ -2,12 +2,13 @@
   <textarea
     #input
     name="textArea"
+    class="gn-ui-text-input leading-tight"
+    [ngClass]="extraClass"
     [disabled]="disabled"
     [placeholder]="placeholder"
-    [value]="value"
+    [value]="value ?? ''"
     (change)="handleChange($event)"
     (input)="handleChange($event)"
-    [class]="classList"
     [attr.required]="required || null"
   ></textarea>
 </div>

package/src/libs/ui/inputs/src/lib/text-area/text-area.component.ts

@@ -7,21 +7,20 @@ import {
 } from '@angular/core'
 import { Subject } from 'rxjs'
 import { distinctUntilChanged } from 'rxjs/operators'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-text-area',
   templateUrl: './text-area.component.html',
   styleUrls: ['./text-area.component.css'],
   standalone: true,
+  imports: [CommonModule],
 })
 export class TextAreaComponent implements AfterViewInit {
-  private readonly baseClasses: string
-  private readonly disabledClasses: string
-
   @Input() value = ''
   @Input() disabled = false
   @Input() extraClass = ''
-  @Input() placeholder: string
+  @Input() placeholder = ''
   @Input() required = false
 
   rawChange = new Subject<string>()
@@ -29,30 +28,6 @@ export class TextAreaComponent implements AfterViewInit {
 
   @ViewChild('input') input
 
-  constructor() {
-    this.baseClasses = [
-      'w-full',
-      'pt-2',
-      'pl-2',
-      'resize-none',
-      'border',
-      'border-gray-800',
-      'rounded italic',
-      'leading-tight',
-      'focus:outline-none',
-      'focus:bg-background',
-      'focus:border-primary',
-    ].join(' ')
-
-    this.disabledClasses = ['cursor-not-allowed'].join(' ')
-  }
-
-  get classList() {
-    return `${this.baseClasses} ${this.extraClass} ${
-      this.disabled ? this.disabledClasses : ''
-    }`
-  }
-
   ngAfterViewInit() {
     this.checkRequired(this.input.nativeElement.value)
   }

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

@@ -1,12 +1,13 @@
 <input
   #input
-  [class]="classList"
+  class="gn-ui-text-input"
+  [ngClass]="extraClass"
   type="text"
   [value]="value"
   (change)="handleChange($event)"
   (input)="handleChange($event)"
-  [placeholder]="hint"
-  [attr.aria-label]="hint"
+  [placeholder]="placeholder"
+  [attr.aria-label]="placeholder"
   [attr.required]="required || null"
   [disabled]="disabled"
 />

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

@@ -7,37 +7,25 @@ import {
 } from '@angular/core'
 import { distinctUntilChanged } from 'rxjs/operators'
 import { Subject } from 'rxjs'
+import { CommonModule } from '@angular/common'
 
 @Component({
   selector: 'gn-ui-text-input',
   templateUrl: './text-input.component.html',
   styleUrls: ['./text-input.component.css'],
+  standalone: true,
+  imports: [CommonModule],
 })
 export class TextInputComponent implements AfterViewInit {
-  private readonly baseClass = [
-    'appearance-none',
-    'border border-gray-300',
-    'rounded w-full',
-    'p-2',
-    'text-gray-700',
-    'leading-tight',
-    'focus:outline-none',
-    'focus:border-primary',
-  ].join(' ')
-
   @Input() value = ''
   @Input() extraClass = ''
-  @Input() hint: string
+  @Input() placeholder: string
   @Input() required = false
   @Input() disabled: boolean
   rawChange = new Subject<string>()
   @Output() valueChange = this.rawChange.pipe(distinctUntilChanged())
   @ViewChild('input') input
 
-  get classList() {
-    return `${this.baseClass} ${this.extraClass}`
-  }
-
   ngAfterViewInit() {
     this.checkRequired(this.input.nativeElement.value)
   }

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

@@ -10,7 +10,6 @@ import { ChipsInputComponent } from './chips-input/chips-input.component'
 import { DragAndDropFileInputComponent } from './drag-and-drop-file-input/drag-and-drop-file-input.component'
 import { DropdownSelectorComponent } from './dropdown-selector/dropdown-selector.component'
 import { TextAreaComponent } from './text-area/text-area.component'
-import { TextInputComponent } from './text-input/text-input.component'
 import { MatAutocompleteModule } from '@angular/material/autocomplete'
 import { MatIconModule } from '@angular/material/icon'
 import { NavigationButtonComponent } from './navigation-button/navigation-button.component'
@@ -36,7 +35,6 @@ import { ImageInputComponent } from './image-input/image-input.component'
 
 @NgModule({
   declarations: [
-    TextInputComponent,
     DragAndDropFileInputComponent,
     ChipsInputComponent,
     NavigationButtonComponent,
@@ -77,7 +75,6 @@ import { ImageInputComponent } from './image-input/image-input.component'
   exports: [
     DropdownSelectorComponent,
     ButtonComponent,
-    TextInputComponent,
     DragAndDropFileInputComponent,
     TextAreaComponent,
     ChipsInputComponent,

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

@@ -0,0 +1,9 @@
+:host {
+  --gn-ui-button-rounded: 8px;
+  --gn-ui-button-width: 32px;
+  --gn-ui-button-padding: 0;
+
+  --side-padding: calc(var(--gn-ui-text-input-padding, 0.6em) - 6px);
+  --2x-side-padding: calc(var(--side-padding) * 2);
+  --text-padding: calc(var(--side-padding) + 40px);
+}

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

@@ -0,0 +1,37 @@
+<span class="w-full inline-block relative">
+  <input
+    #input
+    class="gn-ui-text-input px-[var(--text-padding)]"
+    [ngClass]="extraClass"
+    type="url"
+    [value]="value"
+    (input)="handleInput()"
+    (keydown.enter)="handleChange(input)"
+    [placeholder]="placeholder"
+    [attr.aria-label]="placeholder"
+    [disabled]="disabled"
+  />
+  <div
+    class="absolute inset-y-[var(--side-padding)] left-[var(--2x-side-padding)] grid justify-center items-center pointer-events-none"
+    [ngClass]='{
+      "text-primary": !disabled,
+      "text-primary-lightest": disabled,
+    }'
+  >
+    <mat-icon
+      class="material-symbols-outlined h-[24px] !w-[26px] text-[28px] leading-[24px]"
+    >
+      link
+    </mat-icon>
+  </div>
+  <gn-ui-button
+    extraClass="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)]"
+    type="primary"
+    [disabled]="disabled || input.value === ''"
+    (buttonClick)="handleChange(input)"
+  >
+    <mat-icon class="material-symbols-outlined text-[20px] leading-[26px]">
+      arrow_upward
+    </mat-icon>
+  </gn-ui-button>
+</span>