geonetwork-ui 2.4.0-dev.fe59f179 → 2.4.1-dev.73bac9979

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

@@ -7,6 +7,7 @@ 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-picker/date-range-picker.component'
+export * from './lib/date-range-dropdown/date-range-dropdown.component'
 export * from './lib/drag-and-drop-file-input/drag-and-drop-file-input.component'
 export * from './lib/dropdown-multiselect/dropdown-multiselect.component'
 export * from './lib/dropdown-multiselect/dropdown-multiselect.model'
@@ -19,5 +20,9 @@ export * from './lib/star-toggle/star-toggle.component'
 export * from './lib/text-area/text-area.component'
 export * from './lib/text-input/text-input.component'
 export * from './lib/ui-inputs.module'
+export * from './lib/url-input/url-input.component'
 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.css

@@ -1,28 +1,28 @@
-:host {
-  --input-height: 3.5em;
+span {
+  --icon-padding: var(--gn-ui-text-input-border-size, 2px);
+  --icon-width: calc(var(--gn-ui-text-input-padding, 0.6em) * 2 + 1.25em);
 }
-.clear-btn {
-  width: var(--input-height);
-  height: 100%;
+/* this is because we don't want to change the popup alert font size */
+span > *:not(gn-ui-popup-alert) {
+  font-size: var(--gn-ui-text-input-font-size, 1em);
 }
-.search-btn {
-  width: var(--input-height);
-  height: 100%;
-  border-left-width: 0.1em;
+
+input:placeholder-shown {
+  text-overflow: ellipsis;
 }
-mat-icon {
-  width: 100%;
-  height: 100%;
-  padding: 0.65em;
-  font-size: 1.5em;
+gn-ui-button {
+  --gn-ui-button-rounded: 0;
+  --gn-ui-button-width: var(--icon-width);
+  --gn-ui-button-padding: 0;
+  font-size: 1em;
 }
-input {
-  height: var(--input-height);
-  padding: 1.05em;
-  padding-right: calc(2 * var(--input-height));
+ng-icon.search {
+  margin-top: 0.6rem;
+  margin-left: 0.6rem;
 }
-input:placeholder-shown {
-  text-overflow: ellipsis;
+gn-ui-button:last-of-type {
+  --gn-ui-button-rounded: 0 var(--gn-ui-text-input-rounded, 0.25em)
+    var(--gn-ui-text-input-rounded, 0.25em) 0;
 }
 
 .mat-mdc-option.suggestion.mat-mdc-option-active {

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

@@ -1,45 +1,59 @@
-<div class="relative">
+<span class="w-full inline-block relative">
+  <div
+    class="absolute inset-y-[--icon-padding] left-[--icon-padding] w-[--icon-width] pointer-events-none"
+    *ngIf="!allowSubmit"
+  >
+    <ng-icon name="iconoirSearch" class="text-primary search"></ng-icon>
+  </div>
   <input
     #searchInput
     type="text"
-    class="appearance-none focus:outline-white focus:outline-2 focus:outline-dotted focus:outline-offset-2 leading-tight rounded w-full text-black shadow-xl focus:shadow-[0_0_24px_0_rgba(21,40,184,0.09)]"
+    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 absolute inset-y-0 right-0">
-    <button
-      type="button"
-      class="text-primary-lightest hover:text-primary hover:bg-gray-50 transition-all duration-100 clear-btn"
-      *ngIf="searchInput.value"
-      aria-label="Clear"
-      (click)="clear()"
-    >
-      <mat-icon class="material-symbols-outlined">close</mat-icon>
-    </button>
-    <button
-      type="button"
-      class="text-primary bg-white hover:text-primary-darkest hover:bg-gray-100 border-gray-300 hover:border-gray-500 transition-all duration-100 search-btn rounded-r"
-      aria-label="Trigger search"
-      *ngIf="allowSubmit"
-      data-test="autocomplete-submit-btn"
-      (click)="handleClickSearch()"
-    >
-      <mat-icon class="material-symbols-outlined">search</mat-icon>
-    </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]'
+    }}"
+    data-test="clear-btn"
+    *ngIf="searchInput.value"
+    aria-label="Clear"
+    (buttonClick)="clear()"
+  >
+    <ng-icon name="matClose"></ng-icon>
+  </gn-ui-button>
+  <gn-ui-button
+    type="light"
+    extraClass="border-0 border-l-[1px] border-gray-300 hover:border-gray-500 text-primary hover:text-primary-darkest focus:text-primary-darkest absolute inset-y-[--icon-padding] right-[--icon-padding]"
+    aria-label="Trigger search"
+    *ngIf="allowSubmit"
+    data-test="autocomplete-submit-btn"
+    (buttonClick)="handleClickSearch()"
+  >
+    <ng-icon name="iconoirSearch"></ng-icon>
+  </gn-ui-button>
+
   <gn-ui-popup-alert
     *ngIf="error"
     class="absolute mt-2 w-full top-[100%] left-0"
-    icon="error_outline"
+    icon="matErrorOutlineOutline"
     position="top"
     type="warning"
   >
     <span translate>search.autocomplete.error</span>
     {{ error }}
   </gn-ui-popup-alert>
-</div>
+</span>
+
 <mat-autocomplete
   #auto="matAutocomplete"
   (optionSelected)="handleSelection($event)"

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

@@ -32,10 +32,17 @@ import {
   take,
   tap,
 } from 'rxjs/operators'
-import { MatIconModule } from '@angular/material/icon'
 import { PopupAlertComponent } from '../../../../../../libs/ui/widgets/src'
 import { CommonModule } from '@angular/common'
 import { TranslateModule } from '@ngx-translate/core'
+import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirSearch } from '@ng-icons/iconoir'
+import { matClose } from '@ng-icons/material-icons/baseline'
 
 export type AutocompleteItem = unknown
 
@@ -46,12 +53,22 @@ export type AutocompleteItem = unknown
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    MatIconModule,
     PopupAlertComponent,
     MatAutocompleteModule,
     CommonModule,
     TranslateModule,
     ReactiveFormsModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [
+    provideIcons({
+      iconoirSearch,
+      matClose,
+    }),
+    provideNgIconsConfig({
+      size: '1.5rem',
+    }),
   ],
 })
 export class AutocompleteComponent
@@ -61,9 +78,11 @@ 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
+  // this will show a submit button next to the input; if false, a search icon will appear on the left
+  @Input() allowSubmit = false
   @Output() itemSelected = new EventEmitter<AutocompleteItem>()
   @Output() inputSubmitted = new EventEmitter<string>()
   @Output() inputCleared = new EventEmitter<void>()
@@ -206,13 +225,25 @@ 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 = ''
+      this.control.setValue('')
     }
   }
 }

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

@@ -8,11 +8,19 @@
 >
   <span><ng-content></ng-content></span>
   <gn-ui-button
-    class="material-symbols-outlined cursor-pointer text-xs"
+    type="light"
     *ngIf="removable"
     (buttonClick)="removeBadge()"
-    extraClass="p-1 bg-transparent border-0 border-transparent "
+    extraClass="text-xs border-0 px-0 py-0"
+    style="
+      --gn-ui-button-padding: 0;
+      --gn-ui-button-font-size: 0.8em;
+      --gn-ui-button-width: 1.4em;
+      --gn-ui-button-height: 1.4em;
+      --gn-ui-button-rounded: 1.4em;
+      --gn-ui-button-background: var(--gn-ui-badge-background-color, white);
+    "
   >
-    close
+    <ng-icon name="matClose"></ng-icon>
   </gn-ui-button>
 </div>

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

@@ -7,6 +7,12 @@ import {
   Output,
 } from '@angular/core'
 import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { matClose } from '@ng-icons/material-icons/baseline'
 
 @Component({
   selector: 'gn-ui-badge',
@@ -14,7 +20,15 @@ import { ButtonComponent } from '../button/button.component'
   styleUrls: ['./badge.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [CommonModule, ButtonComponent],
+  imports: [CommonModule, ButtonComponent, NgIconComponent],
+  providers: [
+    provideIcons({
+      matClose,
+    }),
+    provideNgIconsConfig({
+      size: '1.2em',
+    }),
+  ],
 })
 export class BadgeComponent {
   @Input() clickable? = false

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

@@ -18,7 +18,14 @@ export class ButtonComponent {
   private btnClass = 'gn-ui-btn-default'
 
   @Input() set type(
-    value: 'primary' | 'secondary' | 'default' | 'outline' | 'light'
+    value:
+      | 'primary'
+      | 'secondary'
+      | 'default'
+      | 'outline'
+      | 'light'
+      | 'gray'
+      | 'black'
   ) {
     // btn-classes are written in full to be picked up by tailwind
     switch (value) {
@@ -34,6 +41,13 @@ export class ButtonComponent {
       case 'light':
         this.btnClass = 'gn-ui-btn-light'
         break
+      case 'gray':
+        this.btnClass = 'gn-ui-btn-gray'
+        break
+      case 'black':
+        this.btnClass = 'gn-ui-btn-black'
+        break
+      case 'default':
       default:
         this.btnClass = 'gn-ui-btn-default'
         break

package/src/libs/ui/inputs/src/lib/check-toggle/check-toggle.component.html

@@ -1,4 +1,7 @@
-<label class="inline-flex relative items-start cursor-pointer" [title]="title">
+<label
+  class="inline-flex relative items-start cursor-pointer"
+  [title]="title || label"
+>
   <span class="shrink-0">
     <input
       type="checkbox"

package/src/libs/ui/inputs/src/lib/check-toggle/check-toggle.component.ts

@@ -20,9 +20,9 @@ export class CheckToggleComponent {
   @Input() label: string
   @Input() value: boolean
   @Input() color: 'primary' | 'secondary' = 'primary'
-  @Output() toggled = new EventEmitter()
+  @Output() toggled = new EventEmitter<boolean>()
 
-  toggle(event: Event) {
-    this.toggled.emit(event)
+  toggle(value: boolean) {
+    this.toggled.emit(value)
   }
 }

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

@@ -54,7 +54,10 @@ export class ChipsInputComponent implements OnInit, OnDestroy {
     }
   }
 
-  constructor(private http: HttpClient, private translate: TranslateService) {
+  constructor(
+    private http: HttpClient,
+    private translate: TranslateService
+  ) {
     this.rawChange = new Subject<Items[]>()
     this.itemsChange = this.rawChange.pipe(distinctUntilChanged())
     this.subscription = new Subscription()

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

@@ -18,15 +18,14 @@
     (click)="copyText($event)"
     [ngClass]="{
       'py-2 px-4 rounded-r-md bg-gray-400 hover:bg-gray-600 focus:bg-gray-800 text-white':
-        displayText
+        displayText,
     }"
-    mat-raised-button
     [matTooltip]="tooltipText"
     matTooltipPosition="above"
   >
-    <mat-icon
-      class="material-symbols-outlined pointer-events-none align-middle card-icon"
-      >content_copy</mat-icon
-    >
+    <ng-icon
+      name="matContentCopy"
+      class="pointer-events-none align-middle card-icon"
+    ></ng-icon>
   </button>
 </div>

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

@@ -1,10 +1,17 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { NgIcon, provideIcons } from '@ng-icons/core'
+import { matContentCopy } from '@ng-icons/material-icons/baseline'
 
 @Component({
   selector: 'gn-ui-copy-text-button',
   templateUrl: './copy-text-button.component.html',
   styleUrls: ['./copy-text-button.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [CommonModule, MatTooltipModule, NgIcon],
+  viewProviders: [provideIcons({ matContentCopy })],
 })
 export class CopyTextButtonComponent {
   @Input() text: string

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.css

@@ -1,3 +1,8 @@
-mat-datepicker-toggle {
-  @apply text-primary;
+: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);
+  --text-padding: calc(var(--side-padding) + 40px);
 }

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.html

@@ -1,12 +1,18 @@
-<div
-  class="flex items-center justify-between rounded-lg border border-gray-300 bg-white"
->
+<span class="w-full inline-block relative">
   <input
-    class="pl-3"
+    class="gn-ui-text-input pr-[var(--text-padding)]"
     [matDatepicker]="picker"
     [value]="date"
     (dateChange)="dateChange.emit($event.value)"
   />
-  <mat-datepicker-toggle matIconSuffix [for]="picker"></mat-datepicker-toggle>
-</div>
+  <gn-ui-button
+    type="light"
+    class="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)] z-10"
+    (buttonClick)="picker.open()"
+    data-cy="date-picker-button"
+    extraClass="h-full"
+  >
+    <ng-icon name="iconoirCalendar" class="text-primary"></ng-icon>
+  </gn-ui-button>
+</span>
 <mat-datepicker #picker></mat-datepicker>

package/src/libs/ui/inputs/src/lib/date-picker/date-picker.component.ts

@@ -7,7 +7,13 @@ import {
 } from '@angular/core'
 import { MatNativeDateModule } from '@angular/material/core'
 import { MatDatepickerModule } from '@angular/material/datepicker'
-import { MatIconModule } from '@angular/material/icon'
+import { ButtonComponent } from '../button/button.component'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirCalendar } from '@ng-icons/iconoir'
 
 @Component({
   selector: 'gn-ui-date-picker',
@@ -15,7 +21,18 @@ import { MatIconModule } from '@angular/material/icon'
   styleUrls: ['./date-picker.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [MatIconModule, MatNativeDateModule, MatDatepickerModule],
+  imports: [
+    MatNativeDateModule,
+    MatDatepickerModule,
+    ButtonComponent,
+    NgIconComponent,
+  ],
+  providers: [
+    provideIcons({ iconoirCalendar }),
+    provideNgIconsConfig({
+      size: '1.5rem',
+    }),
+  ],
 })
 export class DatePickerComponent {
   @Input() date: Date

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.css

@@ -0,0 +1,5 @@
+:host {
+  .mat-date-range-input-container {
+    display: none;
+  }
+}

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.html

@@ -0,0 +1,30 @@
+<gn-ui-button
+  type="outline"
+  extraClass="bg-background w-full !p-[8px] !pl-[16px]"
+  (buttonClick)="picker.open()"
+>
+  <div class="grow flex items-center mr-2 gap-2 overflow-hidden">
+    <div class="text-left font-medium truncate py-1">
+      {{ title }}
+    </div>
+  </div>
+  <ng-icon
+    [name]="isPickerDisplayed ? 'matExpandLess' : 'matExpandMore'"
+    class="shrink-0 opacity-40"
+  >
+  </ng-icon>
+</gn-ui-button>
+<!--date range input is just present for output events and hidden from the DOM-->
+<mat-date-range-input [rangePicker]="picker">
+  <input
+    matStartDate
+    [value]="startDate"
+    (dateInput)="startDateChange.emit($event.value)"
+  />
+  <input
+    matEndDate
+    [value]="endDate"
+    (dateInput)="endDateChange.emit($event.value)"
+  />
+</mat-date-range-input>
+<mat-date-range-picker #picker></mat-date-range-picker>

package/src/libs/ui/inputs/src/lib/date-range-dropdown/date-range-dropdown.component.ts

@@ -0,0 +1,63 @@
+import {
+  AfterViewChecked,
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  Output,
+  ViewChild,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { MatNativeDateModule } from '@angular/material/core'
+import { MatDatepickerModule } from '@angular/material/datepicker'
+import { ButtonComponent } from '../button/button.component'
+import { OverlayContainer } from '@angular/cdk/overlay'
+import { NgIconComponent, provideIcons } from '@ng-icons/core'
+import { matExpandLess, matExpandMore } from '@ng-icons/material-icons/baseline'
+
+@Component({
+  selector: 'gn-ui-date-range-dropdown',
+  standalone: true,
+  imports: [
+    CommonModule,
+    NgIconComponent,
+    MatNativeDateModule,
+    MatDatepickerModule,
+    ButtonComponent,
+  ],
+  providers: [
+    provideIcons({
+      matExpandMore,
+      matExpandLess,
+    }),
+  ],
+  templateUrl: './date-range-dropdown.component.html',
+  styleUrls: ['./date-range-dropdown.component.css'],
+})
+export class DateRangeDropdownComponent implements AfterViewChecked {
+  @Input() title: string
+  @Input() startDate: Date
+  @Input() endDate: Date
+  @Output() startDateChange = new EventEmitter<Date>()
+  @Output() endDateChange = new EventEmitter<Date>()
+
+  @ViewChild('picker') picker: ElementRef
+  isPickerDisplayed = false
+
+  constructor(
+    private overlayContainer: OverlayContainer,
+    private cdr: ChangeDetectorRef
+  ) {}
+
+  ngAfterViewChecked() {
+    this.checkPickerOverlay()
+  }
+
+  checkPickerOverlay() {
+    const overlayContainerElement = this.overlayContainer.getContainerElement()
+    this.isPickerDisplayed =
+      overlayContainerElement.querySelector('.mat-datepicker-content') !== null
+    this.cdr.detectChanges()
+  }
+}

package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.css

@@ -1,3 +1,8 @@
-mat-datepicker-toggle {
-  @apply text-primary;
+: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);
+  --text-padding: calc(var(--side-padding) + 40px);
 }

package/src/libs/ui/inputs/src/lib/date-range-picker/date-range-picker.component.html

@@ -1,24 +1,27 @@
-<div
-  class="flex items-center justify-between rounded-lg border border-gray-300 bg-white"
->
-  <div class="pl-3 flex justify-center">
-    <mat-date-range-input [rangePicker]="picker" class="w-full">
-      <input
-        matStartDate
-        placeholder="Start date"
-        [value]="startDate"
-        (dateInput)="startDateChange.emit($event.value)"
-      />
-      <input
-        matEndDate
-        placeholder="End date"
-        [value]="endDate"
-        (dateInput)="endDateChange.emit($event.value)"
-      />
-    </mat-date-range-input>
-  </div>
-  <mat-datepicker-toggle matSuffix [for]="picker">
-    <mat-icon>calendar_today</mat-icon>
-  </mat-datepicker-toggle>
-</div>
+<span class="w-full inline-block relative">
+  <mat-date-range-input [rangePicker]="picker" class="gn-ui-text-input">
+    <input
+      matStartDate
+      placeholder="Start date"
+      [value]="startDate"
+      (dateInput)="startDateChange.emit($event.value)"
+    />
+    <input
+      matEndDate
+      placeholder="End date"
+      [value]="endDate"
+      (dateInput)="endDateChange.emit($event.value)"
+    />
+  </mat-date-range-input>
+
+  <gn-ui-button
+    type="light"
+    class="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)] z-10"
+    (buttonClick)="picker.open()"
+    extraClass="h-full"
+    data-cy="date-picker-button"
+  >
+    <ng-icon name="iconoirCalendar" class="text-primary"></ng-icon>
+  </gn-ui-button>
+</span>
 <mat-date-range-picker #picker></mat-date-range-picker>