geonetwork-ui 2.4.0 → 2.4.1-dev.2804667fa

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field.component.html

@@ -30,8 +30,11 @@
           #autosize="cdkTextareaAutosize"
           cdkAutosizeMinRows="1"
           data-test="recordTitleInput"
-          class="grow font-title text-3xl font-normal overflow-hidden"
+          class="grow font-title text-3xl font-normal overflow-hidden text-black/80"
           (change)="valueChange.emit($event.target.value)"
+          [placeholder]="
+            'editor.record.form.field.title.placeholder' | translate
+          "
           >{{ valueAsString }}</textarea
         >
         <div class="flex flex-row justify-between self-start mt-0.5">

package/src/libs/feature/editor/src/lib/components/record-form/record-form.component.html

@@ -6,14 +6,11 @@
     "
   >
     <ng-container *ngIf="!section.hidden">
-      <div class="flex flex-col gap-8 border p-8 rounded-[8px] shadow">
-        <div
-          class="flex flex-col gap-2"
-          [ngClass]="section.labelKey ? 'mb-4' : 'hidden'"
-        >
+      <div class="flex flex-col gap-6 border p-8 rounded-[8px] shadow">
+        <div class="flex flex-col gap-2">
           <div
             *ngIf="section.labelKey"
-            class="text-2xl font-title text-main"
+            class="text-2xl font-title text-black"
             translate
           >
             {{ section.labelKey }}

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -61,9 +61,7 @@ export const RECORD_LICENSE_FIELD: EditorField = {
 
 export const RECORD_KEYWORDS_FIELD: EditorField = {
   model: 'keywords',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.keywords'),
-  },
+  formFieldConfig: {},
 }
 
 export const RECORD_RESOURCE_CREATED_FIELD: EditorField = {
@@ -156,25 +154,19 @@ export const RECORD_SPATIAL_TOGGLE_FIELD: EditorField = {
 
 export const RECORD_SPATIAL_EXTENTS_FIELD: EditorField = {
   model: 'spatialExtents',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.spatialExtents'),
-  },
+  formFieldConfig: {},
 }
 
 export const RECORD_ONLINE_RESOURCES: EditorField = {
   model: 'onlineResources',
   modelSpecifier: 'onlineResourceType:!link',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.onlineResources'),
-  },
+  formFieldConfig: {},
 }
 
 export const RECORD_ONLINE_LINK_RESOURCES: EditorField = {
   model: 'onlineResources',
   modelSpecifier: 'onlineResourceType:link',
-  formFieldConfig: {
-    labelKey: marker('editor.record.form.field.onlineLinkResources'),
-  },
+  formFieldConfig: {},
 }
 
 /************************************************************
@@ -273,7 +265,12 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
   pages: [
     {
       labelKey: marker('editor.record.form.page.description'),
-      sections: [TITLE_SECTION, ABOUT_SECTION, GEOGRAPHICAL_COVERAGE_SECTION],
+      sections: [
+        TITLE_SECTION,
+        ABOUT_SECTION,
+        CLASSIFICATION_SECTION,
+        GEOGRAPHICAL_COVERAGE_SECTION,
+      ],
     },
     {
       labelKey: marker('editor.record.form.page.ressources'),
@@ -282,7 +279,6 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
     {
       labelKey: marker('editor.record.form.page.accessAndContact'),
       sections: [
-        CLASSIFICATION_SECTION,
         USE_AND_ACCESS_CONDITIONS_SECTION,
         DATA_MANAGERS_SECTION,
         METADATA_POINT_OF_CONTACT_SECTION,

package/src/libs/feature/editor/src/lib/services/editor.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { Observable, switchMap } from 'rxjs'
+import { forkJoin, Observable, of, switchMap } from 'rxjs'
 import { map, tap } from 'rxjs/operators'
 import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { EditorConfig } from '../models/'
@@ -16,8 +16,7 @@ export class EditorService {
   saveRecord(
     record: CatalogRecord,
     recordSource: string,
-    fieldsConfig: EditorConfig,
-    generateNewUniqueIdentifier = false
+    fieldsConfig: EditorConfig
   ): Observable<[CatalogRecord, string]> {
     const savedRecord = { ...record }
 
@@ -35,22 +34,25 @@ export class EditorService {
         })
       }
     }
-
-    // if we want a new unique identifier, clear the existing one
-    if (generateNewUniqueIdentifier) {
+    let publishToAll = true
+    // if the record is new, generate a new unique identifier and pass publishToAll as false
+    if (!record.uniqueIdentifier) {
       savedRecord.uniqueIdentifier = null
+      publishToAll = false
     }
 
-    return this.recordsRepository.saveRecord(savedRecord, recordSource).pipe(
-      switchMap((uniqueIdentifier) =>
-        this.recordsRepository.openRecordForEdition(uniqueIdentifier)
-      ),
-      tap(() => {
-        // if saving was successful, the original draft can be discarded
-        this.recordsRepository.clearRecordDraft(record.uniqueIdentifier)
-      }),
-      map(([record, recordSource]) => [record, recordSource])
-    )
+    return this.recordsRepository
+      .saveRecord(savedRecord, recordSource, publishToAll)
+      .pipe(
+        switchMap((uniqueIdentifier) =>
+          this.recordsRepository.openRecordForEdition(uniqueIdentifier)
+        ),
+        tap(() => {
+          // if saving was successful, the original draft can be discarded
+          this.recordsRepository.clearRecordDraft(record.uniqueIdentifier)
+        }),
+        map(([record, recordSource]) => [record, recordSource])
+      )
   }
 
   // emits and completes once saving is done

package/src/libs/feature/search/src/lib/results-table/results-table-container.component.html

@@ -4,7 +4,6 @@
   [hasDraft]="hasDraft"
   [selectedRecordsIdentifiers]="selectedRecords$ | async"
   [sortOrder]="sortBy$ | async"
-  [isUnsavedDraft]="isUnsavedDraft"
   [canDelete]="canDelete"
   [canDuplicate]="canDuplicate"
   (recordClick)="handleRecordClick($event)"

package/src/libs/feature/search/src/lib/results-table/results-table-container.component.ts

@@ -38,9 +38,6 @@ export class ResultsTableContainerComponent implements OnDestroy {
   hasDraft = (record: CatalogRecord): boolean =>
     this.recordsRepository.recordHasDraft(record.uniqueIdentifier)
 
-  isUnsavedDraft = (record: CatalogRecord): boolean =>
-    this.recordsRepository.isRecordNotYetSaved(record.uniqueIdentifier)
-
   constructor(
     protected searchFacade: SearchFacade,
     private searchService: SearchService,

package/src/libs/ui/dataviz/src/lib/figure/figure.component.html

@@ -10,6 +10,7 @@
   "
 >
   <div
+    data-test="icon-container"
     class="{{ bgClass }} {{
       textClass
     }} text-[1.875em] rounded-full mr-[0.55em] flex justify-center items-center w-[2.2em] h-[2.2em] shrink-0"

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

@@ -5,6 +5,7 @@ export * from './lib/content-ghost/content-ghost.component'
 export * from './lib/download-item/download-item.component'
 export * from './lib/downloads-list/downloads-list.component'
 export * from './lib/error/error.component'
+export * from './lib/image-input/image-input.component'
 export * from './lib/image-overlay-preview/image-overlay-preview.component'
 export * from './lib/link-card/link-card.component'
 export * from './lib/markdown-editor/markdown-editor.component'
@@ -19,5 +20,5 @@ export * from './lib/record-api-form/record-api-form.component'
 export * from './lib/related-record-card/related-record-card.component'
 export * from './lib/thumbnail/thumbnail.component'
 export * from './lib/ui-elements.module'
-export * from './lib/user-preview/user-preview.component'
 export * from './lib/user-feedback-item/user-feedback-item.component'
+export * from './lib/user-preview/user-preview.component'

package/src/libs/ui/{inputs → elements}/src/lib/image-input/image-input.component.html

@@ -2,31 +2,16 @@
 </ng-container>
 
 <ng-template #withImage>
-  <div class="w-full h-full flex flex-col gap-2">
-    <div class="flex-1 group relative">
-      <img
-        class="w-full object-cover border-2 border-gray-300 rounded-lg h-[172px]"
-        [alt]="altText"
-        loading="lazy"
-        [src]="previewUrl"
-      />
-      <gn-ui-button
-        type="outline"
-        style="--gn-ui-button-height: 40px; --gn-ui-button-width: 40px"
-        extraClass="absolute right-2 bottom-2 invisible group-hover:visible bg-background"
-        (buttonClick)="handleDelete()"
-        [disabled]="disabled"
-      >
-        <ng-icon name="iconoirBin"></ng-icon>
-      </gn-ui-button>
-    </div>
+  <div class="w-80 h-full flex flex-col gap-2">
+    <gn-ui-image-overlay-preview class="h-48" [imageUrl]="previewUrl">
+    </gn-ui-image-overlay-preview>
     <gn-ui-text-input
       *ngIf="showAltTextInput"
       [placeholder]="'input.image.altTextPlaceholder' | translate"
       [value]="altText ?? ''"
       (valueChange)="handleAltTextChange($event)"
       extraClass="gn-ui-editor-textarea"
-      [disabled]="disabled"
+      [disabled]="true"
     ></gn-ui-text-input>
     <div class="flex flex-row gap-2 mt-2">
       <gn-ui-button type="gray" (buttonClick)="handleDelete()">

package/src/libs/ui/{inputs → elements}/src/lib/image-input/image-input.component.ts

@@ -9,27 +9,30 @@ import {
   Output,
 } from '@angular/core'
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'
-import { downgradeImage, megabytesToBytes } from '../../../../../../libs/util/shared/src'
-import { firstValueFrom } from 'rxjs'
-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'
-import { TextInputComponent } from '../text-input/text-input.component'
+import {
+  ButtonComponent,
+  FilesDropDirective,
+  TextInputComponent,
+  UrlInputComponent,
+} from '../../../../../../libs/ui/inputs/src'
+import { downgradeImage, megabytesToBytes } from '../../../../../../libs/util/shared/src'
 import {
   NgIconComponent,
   provideIcons,
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import {
+  iconoirBin,
   iconoirFramePlusIn,
+  iconoirLink,
   iconoirMediaImage,
   iconoirMediaImageXmark,
-  iconoirBin,
   iconoirPlus,
-  iconoirLink,
 } from '@ng-icons/iconoir'
+import { TranslateModule } from '@ngx-translate/core'
+import { firstValueFrom } from 'rxjs'
+import { ImageOverlayPreviewComponent } from '../image-overlay-preview/image-overlay-preview.component'
 
 @Component({
   selector: 'gn-ui-image-input',
@@ -46,6 +49,7 @@ import {
     UrlInputComponent,
     TextInputComponent,
     NgIconComponent,
+    ImageOverlayPreviewComponent,
   ],
   providers: [
     provideIcons({

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

@@ -1,23 +1,24 @@
-import { NgModule } from '@angular/core'
 import { CommonModule, NgOptimizedImage } from '@angular/common'
-import { RouterModule } from '@angular/router'
+import { NgModule } from '@angular/core'
+import { FormsModule } from '@angular/forms'
 import { MatTooltipModule } from '@angular/material/tooltip'
-import { UtilSharedModule } from '../../../../../libs/util/shared/src'
-import { PopoverComponent, UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { MaxLinesComponent, UiLayoutModule } from '../../../../../libs/ui/layout/src'
-import { TranslateModule } from '@ngx-translate/core'
-import { ThumbnailComponent } from './thumbnail/thumbnail.component'
+import { RouterModule } from '@angular/router'
 import {
   BadgeComponent,
   TextInputComponent,
   UiInputsModule,
 } from '../../../../../libs/ui/inputs/src'
-import { FormsModule } from '@angular/forms'
+import { MaxLinesComponent, UiLayoutModule } from '../../../../../libs/ui/layout/src'
+import { PopoverComponent, UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { UtilSharedModule } from '../../../../../libs/util/shared/src'
+import { provideNgIconsConfig } from '@ng-icons/core'
+import { TranslateModule } from '@ngx-translate/core'
 import { AvatarComponent } from './avatar/avatar.component'
-import { UserPreviewComponent } from './user-preview/user-preview.component'
+import { ImageInputComponent } from './image-input/image-input.component'
 import { MarkdownParserComponent } from './markdown-parser/markdown-parser.component'
+import { ThumbnailComponent } from './thumbnail/thumbnail.component'
 import { TimeSincePipe } from './user-feedback-item/time-since.pipe'
-import { provideNgIconsConfig } from '@ng-icons/core'
+import { UserPreviewComponent } from './user-preview/user-preview.component'
 
 @NgModule({
   imports: [
@@ -38,6 +39,7 @@ import { provideNgIconsConfig } from '@ng-icons/core'
     BadgeComponent,
     MaxLinesComponent,
     TextInputComponent,
+    ImageInputComponent,
   ],
   providers: [
     provideNgIconsConfig({
@@ -50,6 +52,7 @@ import { provideNgIconsConfig } from '@ng-icons/core'
     AvatarComponent,
     UserPreviewComponent,
     MarkdownParserComponent,
+    ImageInputComponent,
   ],
 })
 export class UiElementsModule {}

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

@@ -6,23 +6,22 @@ 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-picker/date-range-picker.component'
 export * from './lib/date-range-dropdown/date-range-dropdown.component'
+export * from './lib/date-range-picker/date-range-picker.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'
 export * from './lib/dropdown-selector/dropdown-selector.component'
 export * from './lib/dropdown-selector/dropdown-selector.model'
 export * from './lib/editable-label/editable-label.directive'
+export * from './lib/file-input/file-input.component'
+export * from './lib/files-drop/files-drop.directive'
 export * from './lib/navigation-button/navigation-button.component'
 export * from './lib/search-input/search-input.component'
 export * from './lib/star-toggle/star-toggle.component'
+export * from './lib/switch-toggle/switch-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/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/button/button.component.ts

@@ -62,9 +62,10 @@ export class ButtonComponent {
     return `${this.btnClass} ${this.extraClass}`
   }
 
-  handleClick(event: Event) {
+  handleClick(event: MouseEvent) {
     this.buttonClick.emit()
     event.preventDefault()
+    ;(event.currentTarget as HTMLElement).blur()
     propagateToDocumentOnly(event)
   }
 }

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

@@ -48,10 +48,10 @@ import { iconoirCloudUpload, iconoirFramePlusIn } from '@ng-icons/iconoir'
 export class FileInputComponent {
   @Input() maxSizeMB: number
   @Input() uploadProgress?: number
-  @Input() disabled? = false
   @Output() fileChange: EventEmitter<File> = new EventEmitter()
   @Output() urlChange: EventEmitter<string> = new EventEmitter()
   @Output() uploadCancel: EventEmitter<void> = new EventEmitter()
+  @Input() disabled? = false
 
   dragFilesOver = false
 

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

@@ -1,32 +1,16 @@
+import { OverlayModule } from '@angular/cdk/overlay'
+import { CommonModule } from '@angular/common'
 import { NgModule } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { UtilSharedModule } from '../../../../../libs/util/shared/src'
-import { TranslateModule } from '@ngx-translate/core'
-import { TagInputModule } from 'ngx-chips'
-import { NgxDropzoneModule } from 'ngx-dropzone'
-import { ButtonComponent } from './button/button.component'
-import { BadgeComponent } from './badge/badge.component'
-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 { MatAutocompleteModule } from '@angular/material/autocomplete'
-import { DropdownMultiselectComponent } from './dropdown-multiselect/dropdown-multiselect.component'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
-import { OverlayModule } from '@angular/cdk/overlay'
 import { MatCheckboxModule } from '@angular/material/checkbox'
-import { ViewportIntersectorComponent } from './viewport-intersector/viewport-intersector.component'
-import { CheckToggleComponent } from './check-toggle/check-toggle.component'
-import { MatTooltipModule } from '@angular/material/tooltip'
-import { CommonModule } from '@angular/common'
-import { CheckboxComponent } from './checkbox/checkbox.component'
-import { DateRangePickerComponent } from './date-range-picker/date-range-picker.component'
+import { MatNativeDateModule } from '@angular/material/core'
+import { MatDatepickerModule } from '@angular/material/datepicker'
 import { MatFormFieldModule } from '@angular/material/form-field'
 import { MatInputModule } from '@angular/material/input'
-import { MatDatepickerModule } from '@angular/material/datepicker'
-import { MatNativeDateModule } from '@angular/material/core'
-import { EditableLabelDirective } from './editable-label/editable-label.directive'
-import { ImageInputComponent } from './image-input/image-input.component'
+import { MatTooltipModule } from '@angular/material/tooltip'
+import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { UtilSharedModule } from '../../../../../libs/util/shared/src'
 import {
   NgIconComponent,
   provideIcons,
@@ -37,6 +21,21 @@ import {
   matExpandLess,
   matExpandMore,
 } from '@ng-icons/material-icons/baseline'
+import { TranslateModule } from '@ngx-translate/core'
+import { TagInputModule } from 'ngx-chips'
+import { NgxDropzoneModule } from 'ngx-dropzone'
+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'
+import { DropdownSelectorComponent } from './dropdown-selector/dropdown-selector.component'
+import { EditableLabelDirective } from './editable-label/editable-label.directive'
+import { TextAreaComponent } from './text-area/text-area.component'
+import { ViewportIntersectorComponent } from './viewport-intersector/viewport-intersector.component'
 
 @NgModule({
   declarations: [
@@ -66,7 +65,6 @@ import {
     EditableLabelDirective,
     TextAreaComponent,
     ButtonComponent,
-    ImageInputComponent,
     DropdownSelectorComponent,
     DateRangePickerComponent,
     CheckToggleComponent,
@@ -95,7 +93,6 @@ import {
     CheckboxComponent,
     DateRangePickerComponent,
     EditableLabelDirective,
-    ImageInputComponent,
     BadgeComponent,
   ],
 })

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

@@ -1,7 +1,7 @@
 <span class="w-full inline-block relative">
   <input
     #input
-    class="gn-ui-text-input px-[var(--text-padding)]"
+    class="gn-ui-text-input gn-ui-url-input px-[var(--text-padding)]"
     [ngClass]="extraClass"
     type="url"
     [value]="inputValue"
@@ -21,12 +21,14 @@
     <ng-icon name="iconoirLink"></ng-icon>
   </div>
   <gn-ui-button
-    *ngIf="showUploadButton"
+    *ngIf="showValidateButton"
     extraClass="absolute inset-y-[var(--side-padding)] right-[var(--side-padding)]"
     type="primary"
     [disabled]="disabled || input.value === '' || !isValidUrl(input.value)"
     (buttonClick)="handleUpload(input)"
   >
-    <ng-icon name="iconoirArrowUp"> </ng-icon>
+    <ng-content>
+      <ng-icon name="iconoirArrowUp"></ng-icon>
+    </ng-content>
   </gn-ui-button>
 </span>

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

@@ -45,7 +45,7 @@ export class UrlInputComponent {
   @Input() extraClass = ''
   @Input() placeholder = 'https://'
   @Input() disabled: boolean
-  @Input() showUploadButton = true
+  @Input() showValidateButton = true
 
   /**
    * This will emit null if the field is emptied

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

@@ -102,9 +102,9 @@
     <ng-template #cell let-item>
       <span class="text-xs">
         {{
-          (isUnsavedDraft(item)
-            ? 'record.metadata.status.notPublished'
-            : 'record.metadata.status.published'
+          (item.extras?.['isPublishedToAll']
+            ? 'record.metadata.status.published'
+            : 'record.metadata.status.notPublished'
           ) | translate
         }}</span
       >
@@ -123,7 +123,11 @@
     </ng-template>
     <ng-template #cell let-item>
       <div class="flex text-left w-full text-xs">
-        {{ isUnsavedDraft(item) ? '-' : dateToString(item.recordUpdated) }}
+        {{
+          item.extras?.['isPublishedToAll']
+            ? dateToString(item.recordUpdated)
+            : '-'
+        }}
       </div>
     </ng-template>
   </gn-ui-interactive-table-column>

package/src/libs/ui/search/src/lib/results-table/results-table.component.ts

@@ -65,7 +65,6 @@ export class ResultsTableComponent {
   @Input() sortOrder: SortByField = null
   @Input() hasDraft: (record: CatalogRecord) => boolean = () => false
   @Input() canDuplicate: (record: CatalogRecord) => boolean = () => true
-  @Input() isUnsavedDraft: (record: CatalogRecord) => boolean = () => true
   @Input() canDelete: (record: CatalogRecord) => boolean = () => true
 
   // emits the column (field) as well as the order