geonetwork-ui 2.4.1-dev.7a0dc5e3f → 2.4.1-dev.89bb09dfa

package/src/libs/data-access/gn4/src/openapi/api/records.api.service.ts

@@ -1371,7 +1371,10 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'body',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' }
+    options?: {
+      httpHeaderAccept?: 'application/json'
+      httpContentTypeSelected?: 'application/json;charset=UTF-8'
+    }
   ): Observable<string>
   public create(
     sourceUuid: string,
@@ -1389,7 +1392,10 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'response',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' }
+    options?: {
+      httpHeaderAccept?: 'application/json'
+      httpContentTypeSelected?: 'application/json;charset=UTF-8'
+    }
   ): Observable<HttpResponse<string>>
   public create(
     sourceUuid: string,
@@ -1407,7 +1413,10 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe?: 'events',
     reportProgress?: boolean,
-    options?: { httpHeaderAccept?: 'application/json' }
+    options?: {
+      httpHeaderAccept?: 'application/json'
+      httpContentTypeSelected?: 'application/json;charset=UTF-8'
+    }
   ): Observable<HttpEvent<string>>
   public create(
     sourceUuid: string,
@@ -1425,7 +1434,10 @@ export class RecordsApiService {
     hasAttachmentsOfSource?: boolean,
     observe: any = 'body',
     reportProgress: boolean = false,
-    options?: { httpHeaderAccept?: 'application/json' }
+    options?: {
+      httpHeaderAccept?: 'application/json'
+      httpContentTypeSelected?: 'application/json;charset=UTF-8'
+    }
   ): Observable<any> {
     if (sourceUuid === null || sourceUuid === undefined) {
       throw new Error(
@@ -1510,6 +1522,14 @@ export class RecordsApiService {
 
     let headers = this.defaultHeaders
 
+    // to determine the Content-Type header
+    const consumes: string[] = ['application/json;charset=UTF-8']
+    const httpContentTypeSelected: string | undefined =
+      this.configuration.selectHeaderContentType(consumes)
+    if (httpContentTypeSelected !== undefined) {
+      headers = headers.set('Content-Type', httpContentTypeSelected)
+    }
+
     let httpHeaderAcceptSelected: string | undefined =
       options && options.httpHeaderAccept
     if (httpHeaderAcceptSelected === undefined) {

package/src/libs/feature/editor/src/lib/+state/editor.actions.ts

@@ -7,7 +7,6 @@ export const openRecord = createAction(
   '[Editor] Open record',
   props<{
     record: CatalogRecord
-    alreadySavedOnce: boolean
     recordSource?: string | null
   }>()
 )
@@ -51,3 +50,13 @@ export const hasRecordChangedSinceDraftSuccess = createAction(
   '[Editor] Has Record Changed Since Draft Success',
   props<{ changes: { user: string; date: Date } }>()
 )
+
+export const isPublished = createAction(
+  '[Editor] Record Saved But Not Published',
+  props<{ isPublished: boolean }>()
+)
+
+export const canEditRecord = createAction(
+  '[Editor] User can edit record',
+  props<{ canEditRecord: boolean }>()
+)

package/src/libs/feature/editor/src/lib/+state/editor.effects.ts

@@ -8,7 +8,6 @@ import { Store } from '@ngrx/store'
 import {
   selectEditorConfig,
   selectRecord,
-  selectRecordAlreadySavedOnce,
   selectRecordSource,
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
@@ -28,31 +27,27 @@ export class EditorEffects {
       withLatestFrom(
         this.store.select(selectRecord),
         this.store.select(selectRecordSource),
-        this.store.select(selectEditorConfig),
-        this.store.select(selectRecordAlreadySavedOnce)
+        this.store.select(selectEditorConfig)
       ),
-      switchMap(([, record, recordSource, fieldsConfig, alreadySavedOnce]) =>
-        this.editorService
-          .saveRecord(record, recordSource, fieldsConfig, !alreadySavedOnce)
-          .pipe(
-            switchMap(([record, recordSource]) =>
-              of(
-                EditorActions.saveRecordSuccess(),
-                EditorActions.openRecord({
-                  record,
-                  alreadySavedOnce: true,
-                  recordSource,
-                })
-              )
-            ),
-            catchError((error) =>
-              of(
-                EditorActions.saveRecordFailure({
-                  error,
-                })
-              )
+      switchMap(([, record, recordSource, fieldsConfig]) =>
+        this.editorService.saveRecord(record, recordSource, fieldsConfig).pipe(
+          switchMap(([record, recordSource]) =>
+            of(
+              EditorActions.saveRecordSuccess(),
+              EditorActions.openRecord({
+                record,
+                recordSource,
+              })
+            )
+          ),
+          catchError((error) =>
+            of(
+              EditorActions.saveRecordFailure({
+                error,
+              })
             )
           )
+        )
       )
     )
   )
@@ -63,12 +58,14 @@ export class EditorEffects {
         ofType(EditorActions.saveRecordSuccess),
         withLatestFrom(this.store.select(selectRecord)),
         switchMap(([_, record]) => {
-          this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
-            next: (_) => undefined,
-            error: (err) => {
-              console.error(err)
-            },
-          })
+          if (record.uniqueIdentifier !== null) {
+            this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
+              next: (_) => undefined,
+              error: (err) => {
+                console.error(err)
+              },
+            })
+          }
           return EMPTY
         }),
         catchError((error) => {
@@ -106,10 +103,9 @@ export class EditorEffects {
       ofType(EditorActions.undoRecordDraft),
       withLatestFrom(this.store.select(selectRecord)),
       switchMap(([, record]) => this.editorService.undoRecordDraft(record)),
-      map(([record, recordSource, alreadySavedOnce]) =>
+      map(([record, recordSource]) =>
         EditorActions.openRecord({
           record,
-          alreadySavedOnce,
           recordSource,
         })
       )
@@ -141,4 +137,34 @@ export class EditorEffects {
       )
     )
   )
+
+  checkIsRecordPublished$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(EditorActions.openRecord),
+      map(({ record }) => record.uniqueIdentifier),
+      switchMap((uniqueIdentifier) =>
+        this.recordsRepository.getRecordPublicationStatus(uniqueIdentifier)
+      ),
+      map((isPublished) =>
+        EditorActions.isPublished({
+          isPublished: isPublished,
+        })
+      )
+    )
+  )
+
+  checkCanEditRecord$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(EditorActions.openRecord),
+      map(({ record }) => record.uniqueIdentifier),
+      switchMap((uniqueIdentifier) =>
+        this.recordsRepository.canEditRecord(uniqueIdentifier)
+      ),
+      map((canEditRecord) =>
+        EditorActions.canEditRecord({
+          canEditRecord: canEditRecord,
+        })
+      )
+    )
+  )
 }

package/src/libs/feature/editor/src/lib/+state/editor.facade.ts

@@ -14,9 +14,6 @@ export class EditorFacade {
 
   record$ = this.store.pipe(select(EditorSelectors.selectRecord))
   recordSource$ = this.store.pipe(select(EditorSelectors.selectRecordSource))
-  alreadySavedOnce$ = this.store.pipe(
-    select(EditorSelectors.selectRecordAlreadySavedOnce)
-  )
   saving$ = this.store.pipe(select(EditorSelectors.selectRecordSaving))
   saveError$ = this.store.pipe(
     select(EditorSelectors.selectRecordSaveError),
@@ -35,14 +32,15 @@ export class EditorFacade {
   hasRecordChanged$ = this.store.pipe(
     select(EditorSelectors.selectHasRecordChanged)
   )
+  isPublished$ = this.store.pipe(select(EditorSelectors.selectIsPublished))
+  canEditRecord$ = this.store.pipe(select(EditorSelectors.selectCanEditRecord))
 
-  openRecord(
-    record: CatalogRecord,
-    recordSource: string,
-    alreadySavedOnce: boolean
-  ) {
+  openRecord(record: CatalogRecord, recordSource: string) {
     this.store.dispatch(
-      EditorActions.openRecord({ record, recordSource, alreadySavedOnce })
+      EditorActions.openRecord({
+        record,
+        recordSource,
+      })
     )
     this.setCurrentPage(0)
   }
@@ -70,4 +68,12 @@ export class EditorFacade {
   checkHasRecordChanged(record: CatalogRecord) {
     this.store.dispatch(EditorActions.hasRecordChangedSinceDraft({ record }))
   }
+
+  isPublished(isPublished: boolean) {
+    this.store.dispatch(EditorActions.isPublished({ isPublished }))
+  }
+
+  canEditRecord(canEditRecord: boolean) {
+    this.store.dispatch(EditorActions.canEditRecord({ canEditRecord }))
+  }
 }

package/src/libs/feature/editor/src/lib/+state/editor.reducer.ts

@@ -18,13 +18,14 @@ export const EDITOR_FEATURE_KEY = 'editor'
 export interface EditorState {
   record: CatalogRecord | null
   recordSource: string | null
-  alreadySavedOnce: boolean
   saving: boolean
   saveError: SaveRecordError | null
   changedSinceSave: boolean
   editorConfig: EditorConfig
   currentPage: number
   hasRecordChanged: { user: string; date: Date }
+  isPublished: boolean
+  canEditRecord: boolean
 }
 
 export interface EditorPartialState {
@@ -34,27 +35,24 @@ export interface EditorPartialState {
 export const initialEditorState: EditorState = {
   record: null,
   recordSource: null,
-  alreadySavedOnce: false,
   saving: false,
   saveError: null,
   changedSinceSave: false,
   editorConfig: DEFAULT_CONFIGURATION,
   currentPage: 0,
   hasRecordChanged: null,
+  isPublished: true,
+  canEditRecord: true,
 }
 
 const reducer = createReducer(
   initialEditorState,
-  on(
-    EditorActions.openRecord,
-    (state, { record, recordSource, alreadySavedOnce }) => ({
-      ...state,
-      changedSinceSave: false,
-      recordSource: recordSource ?? null,
-      alreadySavedOnce,
-      record,
-    })
-  ),
+  on(EditorActions.openRecord, (state, { record, recordSource }) => ({
+    ...state,
+    changedSinceSave: false,
+    recordSource: recordSource ?? null,
+    record,
+  })),
   on(EditorActions.saveRecord, (state) => ({
     ...state,
     saving: true,
@@ -110,6 +108,14 @@ const reducer = createReducer(
   on(EditorActions.hasRecordChangedSinceDraftSuccess, (state, { changes }) => ({
     ...state,
     hasRecordChanged: changes,
+  })),
+  on(EditorActions.isPublished, (state, { isPublished }) => ({
+    ...state,
+    isPublished: isPublished,
+  })),
+  on(EditorActions.canEditRecord, (state, { canEditRecord }) => ({
+    ...state,
+    canEditRecord: canEditRecord,
   }))
 )
 

package/src/libs/feature/editor/src/lib/+state/editor.selectors.ts

@@ -30,11 +30,6 @@ export const selectRecordChangedSinceSave = createSelector(
   (state: EditorState) => state.changedSinceSave
 )
 
-export const selectRecordAlreadySavedOnce = createSelector(
-  selectEditorState,
-  (state: EditorState) => state.alreadySavedOnce
-)
-
 export const selectEditorConfig = createSelector(
   selectEditorState,
   (state: EditorState) => state.editorConfig
@@ -48,11 +43,11 @@ export const selectCurrentPage = createSelector(
 export const selectRecordSections = createSelector(
   selectEditorState,
   (state: EditorState) => {
-    const currentPage = state.editorConfig.pages[state.currentPage]
-    if (!currentPage) {
+    const currentPageConfig = state.editorConfig.pages[state.currentPage]
+    if (!currentPageConfig) {
       return [] as EditorSectionWithValues[]
     }
-    return currentPage.sections.map((section) => ({
+    return currentPageConfig.sections.map((section) => ({
       ...section,
       fieldsWithValues: section.fields.map((fieldConfig) => ({
         config: fieldConfig,
@@ -66,3 +61,13 @@ export const selectHasRecordChanged = createSelector(
   selectEditorState,
   (state: EditorState) => state.hasRecordChanged
 )
+
+export const selectIsPublished = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.isPublished
+)
+
+export const selectCanEditRecord = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.canEditRecord
+)

package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.html

@@ -22,7 +22,7 @@
     class="mt-3.5"
     [value]="constraint_.url?.toString()"
     (valueChange)="handleURLChange($event)"
-    [showUploadButton]="false"
+    [showValidateButton]="false"
   >
   </gn-ui-url-input>
 </div>

package/src/libs/feature/editor/src/lib/components/generic-keywords/generic-keywords.component.html

@@ -1,4 +1,4 @@
-<div class="flex flex-col gap-3">
+<div class="flex flex-col gap-4">
   <gn-ui-autocomplete
     [placeholder]="placeholder"
     [displayWithFn]="displayWithFn"

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.html

@@ -11,12 +11,13 @@
     help
   </span>
 </div>
-<div class="flex flex-row items-center gap-[16px] h-[48px]">
+<div class="flex flex-row items-center gap-4 h-[48px]">
   <mat-radio-group
     aria-labelledby="example-radio-group-label"
     class="flex flex-row gap-[8px]"
     [(ngModel)]="service.accessServiceProtocol"
     [disabled]="disabled"
+    (change)="resetLayersSuggestion()"
   >
     <mat-radio-button
       *ngFor="let protocolOption of protocolOptions"
@@ -26,8 +27,63 @@
     </mat-radio-button>
   </mat-radio-group>
 </div>
-<gn-ui-text-input
-  [(value)]="service.identifierInService"
-  data-cy="identifier-in-service"
-  [disabled]="disabled"
-></gn-ui-text-input>
+
+<div class="flex flex-col gap-4">
+  <gn-ui-url-input
+    class="w-full"
+    (uploadClick)="handleUploadClick($event)"
+    (valueChange)="handleUrlValueChange($event)"
+    [disabled]="disabled"
+    [value]="url"
+    [showValidateButton]="activeLayerSuggestion"
+  >
+    <ng-content *ngIf="activeLayerSuggestion">
+      <ng-icon name="iconoirCloudUpload"></ng-icon>
+    </ng-content>
+  </gn-ui-url-input>
+
+  <p class="text-sm text-red-500 pl-4" *ngIf="errorMessage" translate>
+    editor.record.form.field.onlineResource.edit.identifier.error
+  </p>
+
+  <gn-ui-text-input
+    class="grow border-b border-gray-300 pb-4"
+    [(value)]="service.identifierInService"
+    [placeholder]="getIdentifierPlaceholder() | translate"
+    data-cy="identifier-in-service"
+    [disabled]="disabled"
+    *ngIf="
+      !activeLayerSuggestion ||
+      (url && errorMessage) ||
+      (modifyMode && layers === undefined)
+    "
+  ></gn-ui-text-input>
+  <gn-ui-dropdown-selector
+    class="border-b border-gray-300 pb-4"
+    [showTitle]="false"
+    [title]="
+      'editor.record.form.field.onlineResource.edit.identifier.select.label'
+        | translate
+    "
+    [choices]="layers || []"
+    *ngIf="activeLayerSuggestion && layers !== undefined"
+    [selected]="service.identifierInService"
+    (selectValue)="handleSelectValue($event)"
+  >
+  </gn-ui-dropdown-selector>
+  <gn-ui-button
+    (buttonClick)="submitIdentifier(service.identifierInService)"
+    [disabled]="disabled || !service.identifierInService"
+    type="primary"
+    *ngIf="
+      !modifyMode &&
+      ((activeLayerSuggestion && layers) ||
+        !activeLayerSuggestion ||
+        (url && errorMessage))
+    "
+  >
+    <span class="text-white font-bold" translate>
+      editor.record.form.field.onlineResource.edit.identifier.submit</span
+    >
+  </gn-ui-button>
+</div>

package/src/libs/feature/editor/src/lib/components/online-service-resource-input/online-service-resource-input.component.ts

@@ -1,9 +1,13 @@
 import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
+  EventEmitter,
   Input,
   OnChanges,
+  OnInit,
+  Output,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { MatRadioModule } from '@angular/material/radio'
@@ -13,8 +17,21 @@ import {
   DatasetServiceDistribution,
   ServiceProtocol,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
-import { TextInputComponent } from '../../../../../../../libs/ui/inputs/src'
+import {
+  ButtonComponent,
+  DropdownChoice,
+  DropdownSelectorComponent,
+  TextInputComponent,
+  UrlInputComponent,
+} from '../../../../../../../libs/ui/inputs/src'
 import { TranslateModule } from '@ngx-translate/core'
+import {
+  NgIconComponent,
+  provideIcons,
+  provideNgIconsConfig,
+} from '@ng-icons/core'
+import { iconoirCloudUpload } from '@ng-icons/iconoir'
+import { getLayers } from '../../../../../../../libs/util/shared/src'
 
 @Component({
   selector: 'gn-ui-online-service-resource-input',
@@ -23,20 +40,39 @@ import { TranslateModule } from '@ngx-translate/core'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
+    DropdownSelectorComponent,
+    ButtonComponent,
     CommonModule,
+    FormsModule,
     MatTooltipModule,
     MatRadioModule,
-    FormsModule,
+    NgIconComponent,
     TextInputComponent,
     TranslateModule,
+    UrlInputComponent,
+  ],
+  providers: [
+    provideIcons({ iconoirCloudUpload }),
+    provideNgIconsConfig({
+      size: '1.5em',
+    }),
   ],
 })
-export class OnlineServiceResourceInputComponent implements OnChanges {
-  @Input() service: Omit<DatasetServiceDistribution, 'url'>
+export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
+  @Input() service: DatasetServiceDistribution
   @Input() protocolHint?: string
   @Input() disabled? = false
+  @Input() modifyMode? = false
+  @Output() urlChange: EventEmitter<string> = new EventEmitter()
+  @Output() identifierSubmit: EventEmitter<{
+    url: string
+    identifier: string
+  }> = new EventEmitter()
 
+  errorMessage = false
   selectedProtocol: ServiceProtocol
+  url: string
+  layers: DropdownChoice[] | undefined = undefined
 
   protocolOptions: {
     label: string
@@ -72,10 +108,78 @@ export class OnlineServiceResourceInputComponent implements OnChanges {
     },
   ]
 
+  constructor(private cdr: ChangeDetectorRef) {}
+
+  get activeLayerSuggestion() {
+    return !['wps', 'GPFDL', 'esriRest', 'other'].includes(
+      this.service.accessServiceProtocol
+    )
+  }
+
   ngOnChanges() {
     this.selectedProtocol =
       this.protocolOptions.find(
         (option) => option.value === this.service.accessServiceProtocol
       )?.value ?? 'other'
   }
+
+  ngOnInit() {
+    if (this.service.url) {
+      this.url = this.service.url.toString()
+    }
+  }
+
+  handleUrlValueChange(url: string) {
+    this.url = url
+    this.service.url = new URL(url)
+    this.resetLayersSuggestion()
+    this.urlChange.emit(this.url)
+  }
+
+  async handleUploadClick(url: string) {
+    this.url = url
+
+    try {
+      const layers = await getLayers(url, this.service.accessServiceProtocol)
+      this.layers = layers.map((l) => {
+        return {
+          label: l.title ? `${l.title} ${l.name ? `(${l.name})` : ''}` : l.name,
+          value: l.name || l.title,
+        }
+      })
+
+      if (this.layers.length === 0) {
+        throw new Error('No layers found')
+      }
+    } catch (e) {
+      this.errorMessage = true
+      this.layers = undefined
+    }
+
+    this.cdr.detectChanges()
+  }
+
+  handleSelectValue(val: string) {
+    this.service.identifierInService = val
+  }
+
+  resetLayersSuggestion() {
+    this.errorMessage = false
+    this.layers = undefined
+    this.service.identifierInService = null
+  }
+
+  submitIdentifier(identifier: string) {
+    if (!identifier) return
+    this.identifierSubmit.emit({ url: this.url, identifier })
+    this.service.identifierInService = null
+  }
+
+  getIdentifierPlaceholder(): string {
+    const baseKey =
+      'editor.record.form.field.onlineResource.edit.identifier.placeholder'
+    return this.service.accessServiceProtocol === 'wps'
+      ? `${baseKey}.wps`
+      : baseKey
+  }
 }

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

@@ -2,7 +2,7 @@
   <gn-ui-dropdown-selector
     [title]="label"
     [showTitle]="false"
-    [choices]="licenceOptions"
+    [choices]="choices"
     [selected]="selectedLicence"
     (selectValue)="handleLicenceSelection($event)"
     [extraBtnClass]="'input-as-button gn-ui-text-input'"