geonetwork-ui 2.4.1-dev.89bb09dfa → 2.4.1-dev.9ee0df3df

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

@@ -8,6 +8,7 @@ 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'
@@ -27,27 +28,31 @@ export class EditorEffects {
       withLatestFrom(
         this.store.select(selectRecord),
         this.store.select(selectRecordSource),
-        this.store.select(selectEditorConfig)
+        this.store.select(selectEditorConfig),
+        this.store.select(selectRecordAlreadySavedOnce)
       ),
-      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,
-              })
+      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,
+                })
+              )
             )
           )
-        )
       )
     )
   )
@@ -58,14 +63,12 @@ export class EditorEffects {
         ofType(EditorActions.saveRecordSuccess),
         withLatestFrom(this.store.select(selectRecord)),
         switchMap(([_, record]) => {
-          if (record.uniqueIdentifier !== null) {
-            this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
-              next: (_) => undefined,
-              error: (err) => {
-                console.error(err)
-              },
-            })
-          }
+          this.gn4PlateformService.cleanRecordAttachments(record).subscribe({
+            next: (_) => undefined,
+            error: (err) => {
+              console.error(err)
+            },
+          })
           return EMPTY
         }),
         catchError((error) => {
@@ -103,9 +106,10 @@ export class EditorEffects {
       ofType(EditorActions.undoRecordDraft),
       withLatestFrom(this.store.select(selectRecord)),
       switchMap(([, record]) => this.editorService.undoRecordDraft(record)),
-      map(([record, recordSource]) =>
+      map(([record, recordSource, alreadySavedOnce]) =>
         EditorActions.openRecord({
           record,
+          alreadySavedOnce,
           recordSource,
         })
       )
@@ -137,34 +141,4 @@ 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,6 +14,9 @@ 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),
@@ -32,15 +35,14 @@ 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) {
+  openRecord(
+    record: CatalogRecord,
+    recordSource: string,
+    alreadySavedOnce: boolean
+  ) {
     this.store.dispatch(
-      EditorActions.openRecord({
-        record,
-        recordSource,
-      })
+      EditorActions.openRecord({ record, recordSource, alreadySavedOnce })
     )
     this.setCurrentPage(0)
   }
@@ -68,12 +70,4 @@ 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,14 +18,13 @@ 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 {
@@ -35,24 +34,27 @@ 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 }) => ({
-    ...state,
-    changedSinceSave: false,
-    recordSource: recordSource ?? null,
-    record,
-  })),
+  on(
+    EditorActions.openRecord,
+    (state, { record, recordSource, alreadySavedOnce }) => ({
+      ...state,
+      changedSinceSave: false,
+      recordSource: recordSource ?? null,
+      alreadySavedOnce,
+      record,
+    })
+  ),
   on(EditorActions.saveRecord, (state) => ({
     ...state,
     saving: true,
@@ -108,14 +110,6 @@ 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,6 +30,11 @@ 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
@@ -43,11 +48,11 @@ export const selectCurrentPage = createSelector(
 export const selectRecordSections = createSelector(
   selectEditorState,
   (state: EditorState) => {
-    const currentPageConfig = state.editorConfig.pages[state.currentPage]
-    if (!currentPageConfig) {
+    const currentPage = state.editorConfig.pages[state.currentPage]
+    if (!currentPage) {
       return [] as EditorSectionWithValues[]
     }
-    return currentPageConfig.sections.map((section) => ({
+    return currentPage.sections.map((section) => ({
       ...section,
       fieldsWithValues: section.fields.map((fieldConfig) => ({
         config: fieldConfig,
@@ -61,13 +66,3 @@ 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,7 +17,6 @@
     class="flex flex-row gap-[8px]"
     [(ngModel)]="service.accessServiceProtocol"
     [disabled]="disabled"
-    (change)="resetLayersSuggestion()"
   >
     <mat-radio-button
       *ngFor="let protocolOption of protocolOptions"
@@ -31,59 +30,29 @@
 <div class="flex flex-col gap-4">
   <gn-ui-url-input
     class="w-full"
-    (uploadClick)="handleUploadClick($event)"
-    (valueChange)="handleUrlValueChange($event)"
+    (valueChange)="handleUrlChange($event)"
     [disabled]="disabled"
     [value]="url"
-    [showValidateButton]="activeLayerSuggestion"
+    [showValidateButton]="false"
   >
-    <ng-content *ngIf="activeLayerSuggestion">
-      <ng-icon name="iconoirCloudUpload"></ng-icon>
-    </ng-content>
+    <ng-icon name="iconoirCloudUpload"></ng-icon>
   </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"
+    [disabled]="disabled || !service.identifierInService || !url"
     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,12 +1,10 @@
 import { CommonModule } from '@angular/common'
 import {
   ChangeDetectionStrategy,
-  ChangeDetectorRef,
   Component,
   EventEmitter,
   Input,
   OnChanges,
-  OnInit,
   Output,
 } from '@angular/core'
 import { FormsModule } from '@angular/forms'
@@ -19,8 +17,6 @@ import {
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
   ButtonComponent,
-  DropdownChoice,
-  DropdownSelectorComponent,
   TextInputComponent,
   UrlInputComponent,
 } from '../../../../../../../libs/ui/inputs/src'
@@ -31,7 +27,6 @@ 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',
@@ -40,7 +35,6 @@ import { getLayers } from '../../../../../../../libs/util/shared/src'
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    DropdownSelectorComponent,
     ButtonComponent,
     CommonModule,
     FormsModule,
@@ -58,21 +52,18 @@ import { getLayers } from '../../../../../../../libs/util/shared/src'
     }),
   ],
 })
-export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
-  @Input() service: DatasetServiceDistribution
+export class OnlineServiceResourceInputComponent implements OnChanges {
+  @Input() service: Omit<DatasetServiceDistribution, 'url'>
   @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
@@ -108,14 +99,6 @@ export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
     },
   ]
 
-  constructor(private cdr: ChangeDetectorRef) {}
-
-  get activeLayerSuggestion() {
-    return !['wps', 'GPFDL', 'esriRest', 'other'].includes(
-      this.service.accessServiceProtocol
-    )
-  }
-
   ngOnChanges() {
     this.selectedProtocol =
       this.protocolOptions.find(
@@ -123,50 +106,8 @@ export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
       )?.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) {
+  handleUrlChange(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]="choices"
+    [choices]="licenceOptions"
     [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,47 +26,35 @@ type Licence = {
 })
 export class FormFieldLicenseComponent implements OnInit {
   @Input() label: string
-  @Input() recordLicences: Constraint[] = []
-  @Output() recordLicencesChange: EventEmitter<Constraint[]> =
+  @Input() recordConstraints: Constraint[] = []
+  @Output() recordConstraintsChange: EventEmitter<Constraint[]> =
     new EventEmitter()
 
-  choices: Licence[] = AVAILABLE_LICENSES.map((license) => ({
-    label: marker(`editor.record.form.license.${license}`),
-    value: license,
-  }))
-
   selectedLicence: string
 
   ngOnInit(): void {
-    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 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.choices = [
-        {
-          value: this.recordLicences[0].text,
-          label: this.recordLicences[0].text,
-        },
-        ...this.choices,
-      ]
-      this.selectedLicence = this.recordLicences[0].text
+      this.selectedLicence = this.licenceOptions[0].value // cannot select 'etalab' as default as this would toggle the OpenData Toggle
+      this.recordConstraintsChange.emit([{ text: this.selectedLicence }])
     }
   }
 
+  get licenceOptions(): Licence[] {
+    return AVAILABLE_LICENSES.map((license) => ({
+      label: marker(`editor.record.form.license.${license}`),
+      value: license,
+    }))
+  }
+
   handleLicenceSelection(licenceValue: string) {
     this.selectedLicence = licenceValue
-    if (licenceValue === 'unknown') {
-      this.recordLicencesChange.emit([])
-      return
-    } else {
-      this.recordLicencesChange.emit([{ text: licenceValue }])
-    }
+    this.recordConstraintsChange.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,6 +5,7 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleUrlChange($event)"
+    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div class="h-[8px]"></div>
   <gn-ui-sortable-list
@@ -41,9 +42,17 @@
         class="w-full"
         [disabled]="true"
         [value]="onlineResource.url"
-        [disabled]="disabled$ | async"
         [showValidateButton]="false"
+        [disabled]="disabled$ | async"
       ></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,6 +30,7 @@ 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',
@@ -68,12 +69,17 @@ 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 dialog: MatDialog,
+    private editorFacade: EditorFacade
   ) {}
 
   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,6 +4,7 @@
     (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
@@ -13,6 +14,7 @@
     (uploadCancel)="handleUploadCancel()"
     [uploadProgress]="uploadProgress"
     (urlChange)="handleDownloadUrlChange($event)"
+    [disabled]="disabled$ | async"
   ></gn-ui-file-input>
   <div
     *ngIf="selectedType === 'service'"
@@ -21,6 +23,7 @@
     <gn-ui-online-service-resource-input
       [service]="newService"
       [disabled]="disabled$ | async"
+      (urlChange)="handleServiceUrlChange($event)"
       (identifierSubmit)="handleIdentifierSubmit($event)"
     ></gn-ui-online-service-resource-input>
   </div>
@@ -54,22 +57,28 @@
           [(value)]="onlineResource.description"
         ></gn-ui-text-area>
       </div>
-      <ng-container *ngIf="onlineResource.type === 'service'; else urlInput">
+      <ng-container *ngIf="onlineResource.type === 'service'">
         <span class="w-full border-b border-gray-300"></span>
         <gn-ui-online-service-resource-input
           [service]="onlineResource"
-          [modifyMode]="true"
+          [disabled]="disabled$ | async"
         ></gn-ui-online-service-resource-input>
       </ng-container>
-      <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>
+      <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>
     </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>