geonetwork-ui 2.4.1-dev.9ee0df3df → 2.4.1-dev.a28bdabc1

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/online-service-resource-input/online-service-resource-input.component.html

@@ -17,6 +17,7 @@
     class="flex flex-row gap-[8px]"
     [(ngModel)]="service.accessServiceProtocol"
     [disabled]="disabled"
+    (change)="resetLayersSuggestion()"
   >
     <mat-radio-button
       *ngFor="let protocolOption of protocolOptions"
@@ -30,29 +31,59 @@
 <div class="flex flex-col gap-4">
   <gn-ui-url-input
     class="w-full"
-    (valueChange)="handleUrlChange($event)"
+    (uploadClick)="handleUploadClick($event)"
+    (valueChange)="handleUrlValueChange($event)"
     [disabled]="disabled"
     [value]="url"
-    [showValidateButton]="false"
+    [showValidateButton]="activeLayerSuggestion"
   >
-    <ng-icon name="iconoirCloudUpload"></ng-icon>
+    <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 || !url"
+    [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
+    <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,10 +1,12 @@
 import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
+  ChangeDetectorRef,
   Component,
   EventEmitter,
   Input,
   OnChanges,
+  OnInit,
   Output,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
@@ -17,6 +19,8 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
   ButtonComponent,
+  DropdownChoice,
+  DropdownSelectorComponent,
   TextInputComponent,
   UrlInputComponent,
 } from '../../../../../../../libs/ui/inputs/src'
@@ -27,6 +31,7 @@ import {
   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',
@@ -35,6 +40,7 @@ import { iconoirCloudUpload } from '@ng-icons/iconoir'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
+    DropdownSelectorComponent,
     ButtonComponent,
     CommonModule,
     FormsModule,
@@ -52,18 +58,21 @@ import { iconoirCloudUpload } from '@ng-icons/iconoir'
     }),
   ],
 })
-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
@@ -99,6 +108,14 @@ 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(
@@ -106,8 +123,50 @@ export class OnlineServiceResourceInputComponent implements OnChanges {
       )?.value ?? 'other'
   }
 
-  handleUrlChange(url: string) {
+  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) {

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'"

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

@@ -26,35 +26,47 @@ type Licence = {
 })
 export class FormFieldLicenseComponent implements OnInit {
   @Input() label: string
-  @Input() recordConstraints: Constraint[] = []
-  @Output() recordConstraintsChange: EventEmitter<Constraint[]> =
+  @Input() recordLicences: Constraint[] = []
+  @Output() recordLicencesChange: EventEmitter<Constraint[]> =
     new EventEmitter()
 
+  choices: Licence[] = AVAILABLE_LICENSES.map((license) => ({
+    label: marker(`editor.record.form.license.${license}`),
+    value: license,
+  }))
+
   selectedLicence: string
 
   ngOnInit(): void {
-    // get the licence from the record constraints if it is one of the open data licence list
-    this.selectedLicence = this.recordConstraints.find((constraint) => {
-      return this.licenceOptions.find((licence) => {
-        return licence.value === constraint.text
-      })
-    })?.text
-    // otherwise pre-select the first licence option
-    if (this.selectedLicence === undefined) {
-      this.selectedLicence = this.licenceOptions[0].value // cannot select 'etalab' as default as this would toggle the OpenData Toggle
-      this.recordConstraintsChange.emit([{ text: this.selectedLicence }])
+    if (this.recordLicences.length === 0) {
+      this.selectedLicence = 'unknown'
+    } else {
+      this.selectedLicence = this.recordLicences.find((constraint) => {
+        return this.choices.find((licence) => {
+          return licence.value === constraint.text
+        })
+      })?.text
     }
-  }
 
-  get licenceOptions(): Licence[] {
-    return AVAILABLE_LICENSES.map((license) => ({
-      label: marker(`editor.record.form.license.${license}`),
-      value: license,
-    }))
+    if (this.selectedLicence === undefined) {
+      this.choices = [
+        {
+          value: this.recordLicences[0].text,
+          label: this.recordLicences[0].text,
+        },
+        ...this.choices,
+      ]
+      this.selectedLicence = this.recordLicences[0].text
+    }
   }
 
   handleLicenceSelection(licenceValue: string) {
     this.selectedLicence = licenceValue
-    this.recordConstraintsChange.emit([{ text: licenceValue }])
+    if (licenceValue === 'unknown') {
+      this.recordLicencesChange.emit([])
+      return
+    } else {
+      this.recordLicencesChange.emit([{ text: licenceValue }])
+    }
   }
 }

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

@@ -5,7 +5,6 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleUrlChange($event)"
-    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div class="h-[8px]"></div>
   <gn-ui-sortable-list
@@ -42,17 +41,9 @@
         class="w-full"
         [disabled]="true"
         [value]="onlineResource.url"
-        [showValidateButton]="false"
         [disabled]="disabled$ | async"
+        [showValidateButton]="false"
       ></gn-ui-url-input>
     </div>
   </ng-template>
-  <div
-    *ngIf="disabled$ | async"
-    class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"
-    translate
-    data-test="disabled-message"
-  >
-    editor.record.form.field.draft.only.disabled
-  </div>
 </div>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-online-link-resources/form-field-online-link-resources.component.ts

@@ -30,7 +30,6 @@ import { PlatformServiceInterface } from '../../../../../../../../../libs/common
 import { map, Subscription } from 'rxjs'
 import { MatDialog } from '@angular/material/dialog'
 import { MAX_UPLOAD_SIZE_MB } from '../../../../fields.config'
-import { EditorFacade } from '../../../../+state/editor.facade'
 
 @Component({
   selector: 'gn-ui-form-field-online-link-resources',
@@ -69,17 +68,12 @@ export class FormFieldOnlineLinkResourcesComponent {
 
   protected MAX_UPLOAD_SIZE_MB = MAX_UPLOAD_SIZE_MB
 
-  disabled$ = this.editorFacade.alreadySavedOnce$.pipe(
-    map((alreadySavedOnce) => !alreadySavedOnce)
-  )
-
   constructor(
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private platformService: PlatformServiceInterface,
     private cd: ChangeDetectorRef,
-    private dialog: MatDialog,
-    private editorFacade: EditorFacade
+    private dialog: MatDialog
   ) {}
 
   handleFileChange(file: File) {

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

@@ -4,7 +4,6 @@
     (selectedValue)="onSelectedTypeChange($event.value)"
     extraClasses="grow text-sm"
     data-cy="online-resources-type"
-    [disabled]="disabled$ | async"
   ></gn-ui-switch-toggle>
   <div class="h-[8px]"></div>
   <gn-ui-file-input
@@ -14,7 +13,6 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleDownloadUrlChange($event)"
-    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div
     *ngIf="selectedType === 'service'"
@@ -23,7 +21,6 @@
     <gn-ui-online-service-resource-input
       [service]="newService"
       [disabled]="disabled$ | async"
-      (urlChange)="handleServiceUrlChange($event)"
       (identifierSubmit)="handleIdentifierSubmit($event)"
     ></gn-ui-online-service-resource-input>
   </div>
@@ -57,28 +54,22 @@
           [(value)]="onlineResource.description"
         ></gn-ui-text-area>
       </div>
-      <ng-container *ngIf="onlineResource.type === 'service'">
+      <ng-container *ngIf="onlineResource.type === 'service'; else urlInput">
         <span class="w-full border-b border-gray-300"></span>
         <gn-ui-online-service-resource-input
           [service]="onlineResource"
-          [disabled]="disabled$ | async"
+          [modifyMode]="true"
         ></gn-ui-online-service-resource-input>
       </ng-container>
-      <span class="w-full border-b border-gray-300"></span>
-      <gn-ui-url-input
-        class="w-full"
-        [disabled]="true"
-        [value]="onlineResource.url"
-        [showValidateButton]="false"
-      ></gn-ui-url-input>
+      <ng-template #urlInput>
+        <span class="w-full border-b border-gray-300"></span>
+        <gn-ui-url-input
+          class="w-full"
+          [disabled]="true"
+          [value]="onlineResource.url"
+          [showValidateButton]="false"
+        ></gn-ui-url-input>
+      </ng-template>
     </div>
   </ng-template>
-  <div
-    *ngIf="disabled$ | async"
-    class="p-4 text-sm border border-primary bg-primary-lightest rounded-lg"
-    translate
-    data-test="disabled-message"
-  >
-    editor.record.form.field.draft.only.disabled
-  </div>
 </div>