geonetwork-ui 2.4.1-dev.1d2ade24e → 2.4.1-dev.2804667fa

package/src/libs/common/fixtures/src/lib/elasticsearch/search-responses.fixtures.ts

@@ -124,9 +124,9 @@ export const elasticHitsOnlyFixture = () => ({
           sourceCatalogue: '6731be1e-6533-44e0-9b8a-580b45e36e80',
           link: [],
         },
-        edit: true,
+        edit: false,
         owner: false,
-        isPublishedToAll: true,
+        isPublishedToAll: false,
         view: false,
         notify: false,
         download: false,
@@ -203,9 +203,9 @@ export const elasticHitsOnlyFixture = () => ({
           userSavedCount: '4',
           link: [],
         },
-        edit: true,
+        edit: false,
         owner: false,
-        isPublishedToAll: true,
+        isPublishedToAll: false,
         view: false,
         notify: false,
         download: false,
@@ -299,7 +299,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '5',
         },
         sort: [1660176316000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -370,7 +370,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '0',
         },
         sort: [1660089739000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -428,7 +428,7 @@ export const elasticSummaryHitsFixture = () => ({
           userSavedCount: '0',
         },
         sort: [1660089729000],
-        edit: true,
+        edit: false,
         owner: false,
         isPublishedToAll: true,
         view: true,
@@ -1531,7 +1531,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
             },
           ],
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -1715,7 +1715,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
                 op3: ['1', '25', '14688'],
                 op6: ['1', '14688'],
                 op5: ['1', '14688'],
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -2369,7 +2369,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
           inspireAnnexForFirstTheme: 'iii',
           userSavedCount: '0',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -2796,7 +2796,7 @@ export const elasticServiceMetadataHistsFixture = () => ({
                 uuid: 'ebef2115-bee5-40bb-b5cc-4593d82ba334',
                 op0: '1',
                 resourceType: ['dataset', 'map', 'map/static'],
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -4920,7 +4920,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
             },
           ],
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -5148,7 +5148,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
                 op3: '1',
                 op6: '1',
                 op5: '1',
-                edit: true,
+                edit: false,
                 canReview: false,
                 owner: false,
                 isPublishedToAll: true,
@@ -12690,7 +12690,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           inspireAnnexForFirstTheme: 'iii',
           userSavedCount: '0',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -13022,7 +13022,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           userSavedCount: '0',
           sourceCatalogue: 'ce008f24-8e0d-45a8-97f8-9f10399f0190',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,
@@ -13349,7 +13349,7 @@ export const elasticReuseMetadataHitsFixture = () => ({
           userSavedCount: '0',
           sourceCatalogue: 'ce008f24-8e0d-45a8-97f8-9f10399f0190',
         },
-        edit: true,
+        edit: false,
         canReview: false,
         owner: false,
         isPublishedToAll: true,

package/src/libs/common/fixtures/src/lib/records.fixtures.ts

@@ -159,7 +159,6 @@ As such, **it is not very interesting at all.**`,
     defaultLanguage: 'en',
     extras: {
       isPublishedToAll: true,
-      edit: true,
     },
   },
   {

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

@@ -55,8 +55,3 @@ 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

@@ -152,19 +152,4 @@ export class EditorEffects {
       )
     )
   )
-
-  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

@@ -33,7 +33,6 @@ export class EditorFacade {
     select(EditorSelectors.selectHasRecordChanged)
   )
   isPublished$ = this.store.pipe(select(EditorSelectors.selectIsPublished))
-  canEditRecord$ = this.store.pipe(select(EditorSelectors.selectCanEditRecord))
 
   openRecord(record: CatalogRecord, recordSource: string) {
     this.store.dispatch(
@@ -72,8 +71,4 @@ export class EditorFacade {
   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

@@ -25,7 +25,6 @@ export interface EditorState {
   currentPage: number
   hasRecordChanged: { user: string; date: Date }
   isPublished: boolean
-  canEditRecord: boolean
 }
 
 export interface EditorPartialState {
@@ -42,7 +41,6 @@ export const initialEditorState: EditorState = {
   currentPage: 0,
   hasRecordChanged: null,
   isPublished: true,
-  canEditRecord: true,
 }
 
 const reducer = createReducer(
@@ -112,10 +110,6 @@ const reducer = createReducer(
   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

@@ -43,11 +43,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,
@@ -66,8 +66,3 @@ 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)="resetAllFormFields()"
   >
     <mat-radio-button
       *ngFor="let protocolOption of protocolOptions"
@@ -31,60 +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$ | async).length === 0)
-    "
   ></gn-ui-text-input>
-  <gn-ui-autocomplete
-    class="border-b border-gray-300 pb-4"
-    [placeholder]="
-      'editor.record.form.field.onlineResource.edit.identifier.select.label'
-        | translate
-    "
-    [action]="autoCompleteAction"
-    (itemSelected)="handleSelectValue($event)"
-    [displayWithFn]="displayWithFn"
-    [minCharacterCount]="0"
-    [clearOnSelection]="false"
-    *ngIf="activeLayerSuggestion && (layers$ | async)?.length > 0"
-  >
-  </gn-ui-autocomplete>
+
   <gn-ui-button
     (buttonClick)="submitIdentifier(service.identifierInService)"
-    [disabled]="disabled || !service.identifierInService"
+    [disabled]="disabled || !service.identifierInService || !url"
     type="primary"
-    *ngIf="
-      !modifyMode &&
-      ((activeLayerSuggestion && (layers$ | async)) ||
-        !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'
@@ -18,7 +16,6 @@ import {
   ServiceProtocol,
 } from '../../../../../../../libs/common/domain/src/lib/model/record'
 import {
-  AutocompleteComponent,
   ButtonComponent,
   TextInputComponent,
   UrlInputComponent,
@@ -30,15 +27,6 @@ import {
   provideNgIconsConfig,
 } from '@ng-icons/core'
 import { iconoirCloudUpload } from '@ng-icons/iconoir'
-import { createFuzzyFilter, getLayers } from '../../../../../../../libs/util/shared/src'
-import {
-  BehaviorSubject,
-  debounceTime,
-  distinctUntilChanged,
-  map,
-  Observable,
-  switchMap,
-} from 'rxjs'
 
 @Component({
   selector: 'gn-ui-online-service-resource-input',
@@ -47,7 +35,6 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    AutocompleteComponent,
     ButtonComponent,
     CommonModule,
     FormsModule,
@@ -65,23 +52,18 @@ import {
     }),
   ],
 })
-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 = ''
-  layersSubject = new BehaviorSubject<{ name: string; title: string }[]>([])
-  layers$: Observable<{ name: string; title: string }[]> =
-    this.layersSubject.asObservable()
+  url: string
 
   protocolOptions: {
     label: string
@@ -117,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(
@@ -132,48 +106,8 @@ export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
       )?.value ?? 'other'
   }
 
-  ngOnInit() {
-    if (this.service.url) {
-      this.url = this.service.url.toString()
-    }
-  }
-
-  handleUrlValueChange(url: string) {
+  handleUrlChange(url: string) {
     this.url = url
-    this.service.url = url ? new URL(url) : undefined
-    this.resetLayersSuggestion()
-    this.urlChange.emit(this.url)
-  }
-
-  async handleUploadClick(url: string) {
-    this.url = url
-
-    try {
-      const layers = await getLayers(url, this.service.accessServiceProtocol)
-
-      if (layers.length === 0) {
-        throw new Error('No layers found')
-      }
-
-      this.layersSubject.next([...layers])
-    } catch (e) {
-      this.errorMessage = true
-      this.layersSubject.next([])
-    }
-
-    this.cdr.detectChanges()
-  }
-
-  resetAllFormFields() {
-    this.url = ''
-    this.service.url = null
-    this.resetLayersSuggestion()
-  }
-
-  resetLayersSuggestion() {
-    this.errorMessage = false
-    this.layersSubject.next([])
-    this.service.identifierInService = null
   }
 
   submitIdentifier(identifier: string) {
@@ -189,34 +123,4 @@ export class OnlineServiceResourceInputComponent implements OnChanges, OnInit {
       ? `${baseKey}.wps`
       : baseKey
   }
-
-  /**
-   * gn-ui-autocomplete
-   */
-  displayWithFn(item: { name: string; title: string }) {
-    return item.title
-      ? `${item.title} ${item.name ? `(${item.name})` : ''}`
-      : item.name
-  }
-
-  /**
-   * gn-ui-autocomplete
-   */
-  autoCompleteAction = (query: string) => {
-    const fuzzyFilter = createFuzzyFilter(query)
-    return this.layers$.pipe(
-      switchMap((layers) => [
-        layers.filter((layer) => fuzzyFilter(layer.name)),
-      ]),
-      debounceTime(100),
-      distinctUntilChanged()
-    )
-  }
-
-  /**
-   * gn-ui-autocomplete
-   */
-  handleSelectValue(val: { name: string; title: string }) {
-    this.service.identifierInService = val.name
-  }
 }

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-resources/form-field-online-resources.component.html

@@ -21,6 +21,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 +55,19 @@
           [(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"
         ></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>

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

@@ -92,12 +92,11 @@ export class FormFieldOnlineResourcesComponent {
   notLinkResources: OnlineNotLinkResource[] = []
   uploadProgress = undefined
   uploadSubscription: Subscription = null
-  newService = <DatasetServiceDistribution>{
+  newService = {
     type: 'service',
     accessServiceProtocol: 'ogcFeatures',
     identifierInService: '',
-    url: undefined,
-  }
+  } as Omit<DatasetServiceDistribution, 'url'>
 
   protected MAX_UPLOAD_SIZE_MB = MAX_UPLOAD_SIZE_MB
 

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

@@ -112,8 +112,8 @@
     <ng-container *ngSwitchCase="'licenses'">
       <gn-ui-form-field-license
         [label]="config.labelKey! | translate"
-        [recordLicences]="valueAsConstraints"
-        (recordLicencesChange)="valueChange.emit($event)"
+        [recordConstraints]="valueAsConstraints"
+        (recordConstraintsChange)="valueChange.emit($event)"
       ></gn-ui-form-field-license>
     </ng-container>
 

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

@@ -4,9 +4,7 @@ import {
   Component,
   EventEmitter,
   Input,
-  OnChanges,
   Output,
-  SimpleChanges,
 } from '@angular/core'
 import { CommonModule } from '@angular/common'
 import { ButtonComponent } from '../button/button.component'
@@ -31,7 +29,7 @@ import { iconoirArrowUp, iconoirLink } from '@ng-icons/iconoir'
   ],
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UrlInputComponent implements OnChanges {
+export class UrlInputComponent {
   @Input() set value(v: string) {
     // we're making sure to only update the input if the URL representation of it has changed; otherwise we keep it identical
     // to avoid glitches when starting to write a URL and having some characters added/replaced automatically
@@ -59,12 +57,6 @@ export class UrlInputComponent implements OnChanges {
 
   constructor(private cd: ChangeDetectorRef) {}
 
-  ngOnChanges(changes: SimpleChanges) {
-    if (changes['value']) {
-      this.inputValue = changes['value'].currentValue
-    }
-  }
-
   handleInput(event: Event) {
     const value = (event.target as HTMLInputElement).value
     this.inputValue = value