geonetwork-ui 2.2.0-dev.f866474c → 2.3.0-dev.139106e0

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

@@ -69,8 +69,24 @@ Cette section contient des *caractères internationaux* (ainsi que des "caractè
         url: new URL('http://my-org.net/two.png'),
       },
     ],
-    keywords: ['international', 'test', '_another_keyword_'],
-    themes: ['testData', 'exampleData'],
+    keywords: [
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'international',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'test',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: '_another_keyword_',
+      },
+    ],
+    topics: ['testData', 'exampleData'],
     spatialRepresentation: 'grid',
     distributions: [
       {
@@ -115,7 +131,7 @@ As such, **it is not very interesting at all.**`,
         url: new URL('https://data.rennesmetropole.fr/pages/licence/'),
       },
     ],
-    accessConstraints: [
+    legalConstraints: [
       {
         text: "Dataset access isn't possible since it does not really exist",
         type: 'other',
@@ -125,12 +141,15 @@ As such, **it is not very interesting at all.**`,
         type: 'security',
       },
     ],
+    securityConstraints: [],
+    otherConstraints: [],
     spatialExtents: [],
     temporalExtents: [],
     updateFrequency: {
       updatedTimes: 3,
       per: 'month',
     },
+    languages: ['en'],
   },
   {
     uniqueIdentifier: '7d002c4c-92ef-4b9f-a568-d732f740b99e',
@@ -168,13 +187,33 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
       },
     ],
     keywords: [
-      'planification',
-      'PLU',
-      "Plan local d'urbanisme",
-      'données ouvertes',
-      'Avrigny*60036',
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'planification',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'PLU',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: "Plan local d'urbanisme",
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'données ouvertes',
+      },
+      {
+        thesaurus: { id: 'geonetwork.thesaurus.local' },
+        type: 'other',
+        label: 'Avrigny*60036',
+      },
     ],
-    themes: ['Usage des sols', "document d'urbanisme"],
+    topics: ['Usage des sols', "document d'urbanisme"],
     spatialRepresentation: 'vector',
     distributions: [
       {
@@ -189,7 +228,9 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
     ],
     lineage: `Document d’urbanisme numérisé conformément aux prescriptions nationales du CNIG par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.
 Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur de 2019 et contrôlé par le Service d'Information Géographique de l'Agglomération de la Région de Compiègne.`,
-    accessConstraints: [],
+    legalConstraints: [],
+    securityConstraints: [],
+    otherConstraints: [],
     useLimitations: ["Aucune condition ne s'applique", 'Licence Ouverte 2.0'],
     licenses: [
       {
@@ -200,5 +241,6 @@ Ce lot de données produit en 2019, a été numérisé à partir du PCI Vecteur
     temporalExtents: [],
     status: 'completed',
     updateFrequency: 'unknown',
+    languages: ['fr', 'de'],
   },
 ])

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

@@ -30,7 +30,6 @@ import {
 import { ExtentDtoApiModel } from '../model/models'
 import { FeatureResponseApiModel } from '../model/models'
 import { IProcessingReportApiModel } from '../model/models'
-import { InlineObject3ApiModel } from '../model/models'
 import { MetadataBatchApproveParameterApiModel } from '../model/models'
 import { MetadataBatchSubmitParameterApiModel } from '../model/models'
 import { MetadataCategoryApiModel } from '../model/models'
@@ -75,6 +74,20 @@ export class RecordsApiService {
     this.encoder = this.configuration.encoder || new CustomHttpParameterCodec()
   }
 
+  /**
+   * @param consumes string[] mime-types
+   * @return true: consumes contains 'multipart/form-data', false: otherwise
+   */
+  private canConsumeForm(consumes: string[]): boolean {
+    const form = 'multipart/form-data'
+    for (const consume of consumes) {
+      if (form === consume) {
+        return true
+      }
+    }
+    return false
+  }
+
   private addToHttpParams(
     httpParams: HttpParams,
     value: any,
@@ -8290,44 +8303,44 @@ export class RecordsApiService {
   /**
    * Create a new resource for a given metadata
    * @param metadataUuid The metadata UUID
+   * @param file The file to upload
    * @param visibility The sharing policy
    * @param approved Use approved version or not
-   * @param inlineObject3ApiModel
    * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
    * @param reportProgress flag to report request and response progress.
    */
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'body',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<MetadataResourceApiModel>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'response',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpResponse<MetadataResourceApiModel>>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe?: 'events',
     reportProgress?: boolean,
     options?: { httpHeaderAccept?: 'application/json' }
   ): Observable<HttpEvent<MetadataResourceApiModel>>
   public putResource(
     metadataUuid: string,
+    file: Blob,
     visibility?: 'public' | 'private',
     approved?: boolean,
-    inlineObject3ApiModel?: InlineObject3ApiModel,
     observe: any = 'body',
     reportProgress: boolean = false,
     options?: { httpHeaderAccept?: 'application/json' }
@@ -8337,6 +8350,11 @@ export class RecordsApiService {
         'Required parameter metadataUuid was null or undefined when calling putResource.'
       )
     }
+    if (file === null || file === undefined) {
+      throw new Error(
+        'Required parameter file was null or undefined when calling putResource.'
+      )
+    }
 
     let queryParameters = new HttpParams({ encoder: this.encoder })
     if (visibility !== undefined && visibility !== null) {
@@ -8369,11 +8387,24 @@ export class RecordsApiService {
     }
 
     // to determine the Content-Type header
-    const consumes: string[] = ['application/json']
-    const httpContentTypeSelected: string | undefined =
-      this.configuration.selectHeaderContentType(consumes)
-    if (httpContentTypeSelected !== undefined) {
-      headers = headers.set('Content-Type', httpContentTypeSelected)
+    const consumes: string[] = ['multipart/form-data']
+
+    const canConsumeForm = this.canConsumeForm(consumes)
+
+    let formParams: { append(param: string, value: any): any }
+    let useForm = false
+    let convertFormParamsToString = false
+    // use FormData to transmit files using content-type "multipart/form-data"
+    // see https://stackoverflow.com/questions/4007969/application-x-www-form-urlencoded-or-multipart-form-data
+    useForm = canConsumeForm
+    if (useForm) {
+      formParams = new FormData()
+    } else {
+      formParams = new HttpParams({ encoder: this.encoder })
+    }
+
+    if (file !== undefined) {
+      formParams = (formParams.append('file', <any>file) as any) || formParams
     }
 
     let responseType_: 'text' | 'json' = 'json'
@@ -8388,7 +8419,7 @@ export class RecordsApiService {
       `${this.configuration.basePath}/records/${encodeURIComponent(
         String(metadataUuid)
       )}/attachments`,
-      inlineObject3ApiModel,
+      convertFormParamsToString ? formParams.toString() : formParams,
       {
         params: queryParameters,
         responseType: <any>responseType_,

package/src/libs/data-access/gn4/src/openapi/model/models.ts

@@ -33,7 +33,6 @@ export * from './iProcessingReport.api.model'
 export * from './iSODate.api.model'
 export * from './infoReport.api.model'
 export * from './inlineObject1.api.model'
-export * from './inlineObject3.api.model'
 export * from './inlineObject4.api.model'
 export * from './isoLanguage.api.model'
 export * from './jSONObject.api.model'

package/src/libs/data-access/gn4/src/spec.yaml

@@ -7390,7 +7390,7 @@ paths:
           example: true
       requestBody:
         content:
-          application/json:
+          multipart/form-data:
             schema:
               required:
                 - file

package/src/libs/feature/catalog/src/lib/my-org/my-org.service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
-import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs'
+import { combineLatest, map, Observable } from 'rxjs'
 import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user/user.model'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
+import { shareReplay } from 'rxjs/operators'
 
 @Injectable({
   providedIn: 'root',
@@ -16,20 +17,6 @@ export class MyOrgService {
     userList: UserModel[]
   }>
 
-  private myOrgDataSubject = new BehaviorSubject<{
-    orgName: string
-    logoUrl: string
-    recordCount: number
-    userCount: number
-    userList: UserModel[]
-  }>({
-    orgName: '',
-    logoUrl: '',
-    recordCount: 0,
-    userCount: 0,
-    userList: [],
-  })
-
   constructor(
     private platformService: PlatformServiceInterface,
     private orgService: OrganizationsServiceInterface
@@ -55,7 +42,8 @@ export class MyOrgService {
           userList,
           userCount,
         }
-      })
+      }),
+      shareReplay(1)
     )
   }
 }

package/src/libs/feature/dataviz/src/lib/service/data.service.ts

@@ -9,8 +9,8 @@ import {
   SupportedTypes,
 } from '../../../../../../libs/util/data-fetcher/src'
 import {
-  extensionToFormat,
   getFileFormat,
+  getFileFormatFromServiceOutput,
   getMimeTypeForFormat,
   ProxyService,
 } from '../../../../../../libs/util/shared/src'
@@ -45,7 +45,7 @@ interface WfsDownloadUrls {
 export class DataService {
   constructor(private proxy: ProxyService) {}
 
-  private getDownloadUrlsFromWfs(
+  getDownloadUrlsFromWfs(
     wfsUrl: string,
     featureTypeName: string
   ): Observable<WfsDownloadUrls> {
@@ -94,7 +94,7 @@ export class DataService {
           ),
           geojson: endpoint.supportsJson(featureType.name)
             ? endpoint.getFeatureUrl(featureType.name, {
-                outputFormat: 'application/json',
+                asJson: true,
                 outputCrs: 'EPSG:4326',
               })
             : null,
@@ -120,7 +120,7 @@ export class DataService {
     )
   }
 
-  private getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
+  getDownloadUrlFromEsriRest(apiUrl: string, format: string): string {
     return this.proxy.getProxiedUrl(
       `${apiUrl}/query?f=${format}&where=1=1&outFields=*`
     )
@@ -138,8 +138,11 @@ export class DataService {
       map((urls) =>
         Object.keys(urls).map((format) => ({
           ...wfsLink,
+          type: 'download',
           url: new URL(urls[format]),
-          mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+          mimeType: getMimeTypeForFormat(
+            getFileFormatFromServiceOutput(format)
+          ),
         }))
       )
     )
@@ -153,7 +156,7 @@ export class DataService {
       url: new URL(
         this.getDownloadUrlFromEsriRest(esriRestLink.url.toString(), format)
       ),
-      mimeType: getMimeTypeForFormat(extensionToFormat(format)) || format,
+      mimeType: getMimeTypeForFormat(getFileFormatFromServiceOutput(format)),
     }))
   }
 

package/src/libs/feature/editor/src/index.ts

@@ -1,6 +1,11 @@
+export * from './lib/+state/editor.facade'
+export * from './lib/+state/editor.models'
+export * from './lib/+state/editor.selectors'
+export * from './lib/+state/editor.reducer'
+export * from './lib/+state/editor.actions'
 export * from './lib/feature-editor.module'
 export * from './lib/services/editor.service'
-export * from './lib/record-form/record-form.component'
+export * from './lib/components/record-form/record-form.component'
 export * from './lib/components/wizard/wizard.component'
 export * from './lib/components/wizard-field/wizard-field.component'
 export * from './lib/components/wizard-summarize/wizard-summarize.component'

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

@@ -0,0 +1,24 @@
+import { createAction, props } from '@ngrx/store'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { SaveRecordError } from './editor.models'
+
+export const openRecord = createAction(
+  '[Editor] Open record',
+  props<{ record: CatalogRecord }>()
+)
+
+export const updateRecordField = createAction(
+  '[Editor] Update record field',
+  props<{ field: string; value: unknown }>()
+)
+
+export const markRecordAsChanged = createAction(
+  '[Editor] Mark record as changed'
+)
+
+export const saveRecord = createAction('[Editor] Save record')
+export const saveRecordSuccess = createAction('[Editor] Save record success')
+export const saveRecordFailure = createAction(
+  '[Editor] Save record failure',
+  props<{ error: SaveRecordError }>()
+)

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

@@ -0,0 +1,49 @@
+import { inject, Injectable } from '@angular/core'
+import { Actions, createEffect, ofType } from '@ngrx/effects'
+import { of, withLatestFrom } from 'rxjs'
+import { catchError, map, switchMap } from 'rxjs/operators'
+import * as EditorActions from './editor.actions'
+import { EditorService } from '../services/editor.service'
+import { Store } from '@ngrx/store'
+import { selectRecord, selectRecordFieldsConfig } from './editor.selectors'
+
+@Injectable()
+export class EditorEffects {
+  private actions$ = inject(Actions)
+  private editorService = inject(EditorService)
+  private store = inject(Store)
+
+  saveRecord$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(EditorActions.saveRecord),
+      withLatestFrom(
+        this.store.select(selectRecord),
+        this.store.select(selectRecordFieldsConfig)
+      ),
+      switchMap(([, record, fieldsConfig]) =>
+        this.editorService.saveRecord(record, fieldsConfig).pipe(
+          switchMap((newRecord) =>
+            of(
+              EditorActions.saveRecordSuccess(),
+              EditorActions.openRecord({ record: newRecord })
+            )
+          ),
+          catchError((error) =>
+            of(
+              EditorActions.saveRecordFailure({
+                error: error.message,
+              })
+            )
+          )
+        )
+      )
+    )
+  )
+
+  markAsChanged$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(EditorActions.updateRecordField),
+      map(() => EditorActions.markRecordAsChanged())
+    )
+  )
+}

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

@@ -0,0 +1,37 @@
+import { inject, Injectable } from '@angular/core'
+import { select, Store } from '@ngrx/store'
+import * as EditorActions from './editor.actions'
+import * as EditorSelectors from './editor.selectors'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { filter, Observable } from 'rxjs'
+import { Actions, ofType } from '@ngrx/effects'
+
+@Injectable()
+export class EditorFacade {
+  private readonly store = inject(Store)
+  private actions$ = inject(Actions)
+
+  record$ = this.store.pipe(select(EditorSelectors.selectRecord))
+  saving$ = this.store.pipe(select(EditorSelectors.selectRecordSaving))
+  saveError$ = this.store.pipe(
+    select(EditorSelectors.selectRecordSaveError),
+    filter((error) => !!error)
+  )
+  saveSuccess$ = this.actions$.pipe(ofType(EditorActions.saveRecordSuccess))
+  changedSinceSave$ = this.store.pipe(
+    select(EditorSelectors.selectRecordChangedSinceSave)
+  )
+  recordFields$ = this.store.pipe(select(EditorSelectors.selectRecordFields))
+
+  openRecord(record: CatalogRecord) {
+    this.store.dispatch(EditorActions.openRecord({ record }))
+  }
+
+  saveRecord() {
+    this.store.dispatch(EditorActions.saveRecord())
+  }
+
+  updateRecordField(field: string, value: unknown) {
+    this.store.dispatch(EditorActions.updateRecordField({ field, value }))
+  }
+}

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

@@ -0,0 +1 @@
+export type SaveRecordError = string

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

@@ -0,0 +1,68 @@
+import { Action, createReducer, on } from '@ngrx/store'
+import * as EditorActions from './editor.actions'
+import { CatalogRecord } from '../../../../../../libs/common/domain/src/lib/model/record'
+import { SaveRecordError } from './editor.models'
+import { EditorFieldsConfig } from '../models/fields.model'
+import { DEFAULT_FIELDS } from '../fields.config'
+
+export const EDITOR_FEATURE_KEY = 'editor'
+
+export interface EditorState {
+  record: CatalogRecord | null
+  saving: boolean
+  saveError: SaveRecordError | null
+  changedSinceSave: boolean
+  fieldsConfig: EditorFieldsConfig
+}
+
+export interface EditorPartialState {
+  readonly [EDITOR_FEATURE_KEY]: EditorState
+}
+
+export const initialEditorState: EditorState = {
+  record: null,
+  saving: false,
+  saveError: null,
+  changedSinceSave: false,
+  fieldsConfig: DEFAULT_FIELDS,
+}
+
+const reducer = createReducer(
+  initialEditorState,
+  on(EditorActions.openRecord, (state, { record }) => ({
+    ...state,
+    changedSinceSave: false,
+    record,
+  })),
+  on(EditorActions.saveRecord, (state) => ({
+    ...state,
+    saving: true,
+    saveError: null,
+  })),
+  on(EditorActions.saveRecordSuccess, (state) => ({
+    ...state,
+    saving: false,
+    saveError: null,
+    changedSinceSave: false,
+  })),
+  on(EditorActions.saveRecordFailure, (state, { error }) => ({
+    ...state,
+    saving: false,
+    saveError: error,
+  })),
+  on(EditorActions.updateRecordField, (state, { field, value }) => ({
+    ...state,
+    record: {
+      ...state.record,
+      [field]: value,
+    },
+  })),
+  on(EditorActions.markRecordAsChanged, (state) => ({
+    ...state,
+    changedSinceSave: true,
+  }))
+)
+
+export function editorReducer(state: EditorState | undefined, action: Action) {
+  return reducer(state, action)
+}

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

@@ -0,0 +1,39 @@
+import { createFeatureSelector, createSelector } from '@ngrx/store'
+import { EDITOR_FEATURE_KEY, EditorState } from './editor.reducer'
+
+export const selectEditorState =
+  createFeatureSelector<EditorState>(EDITOR_FEATURE_KEY)
+
+export const selectRecord = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.record
+)
+
+export const selectRecordSaving = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.saving
+)
+
+export const selectRecordSaveError = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.saveError
+)
+
+export const selectRecordChangedSinceSave = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.changedSinceSave
+)
+
+export const selectRecordFieldsConfig = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.fieldsConfig
+)
+
+export const selectRecordFields = createSelector(
+  selectEditorState,
+  (state: EditorState) =>
+    state.fieldsConfig.map((fieldConfig) => ({
+      config: fieldConfig,
+      value: state.record?.[fieldConfig.model] || null,
+    }))
+)

package/src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.html

@@ -0,0 +1,8 @@
+<gn-ui-image-input
+  [maxSizeMB]="5"
+  [previewUrl]="resourceUrl"
+  [altText]="resourceFileName"
+  (fileChange)="handleFileChange($event)"
+  (urlChange)="handleUrlChange($event)"
+  (delete)="handleDelete()"
+></gn-ui-image-input>

package/src/libs/feature/editor/src/lib/components/overview-upload/overview-upload.component.ts

@@ -0,0 +1,70 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core'
+import { CommonModule } from '@angular/common'
+import { RecordsApiService } from '../../../../../../../libs/data-access/gn4/src'
+import { UiInputsModule } from '../../../../../../../libs/ui/inputs/src'
+
+@Component({
+  selector: 'gn-ui-overview-upload',
+  standalone: true,
+  imports: [CommonModule, UiInputsModule],
+  templateUrl: './overview-upload.component.html',
+  styleUrls: ['./overview-upload.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class OverviewUploadComponent implements OnInit {
+  @Input() metadataUuid: string
+
+  resourceFileName: string
+  resourceUrl: string
+
+  constructor(
+    private recordsApiService: RecordsApiService,
+    private cd: ChangeDetectorRef
+  ) {}
+
+  ngOnInit(): void {
+    this.recordsApiService
+      .getAllResources(this.metadataUuid)
+      .subscribe((resources) => {
+        this.resourceFileName = resources[0]?.filename
+        this.resourceUrl = resources[0]?.url
+        this.cd.markForCheck()
+      })
+  }
+
+  handleFileChange(file: File) {
+    this.recordsApiService
+      .putResource(this.metadataUuid, file, 'public')
+      .subscribe((resource) => {
+        this.resourceFileName = resource.filename
+        this.resourceUrl = resource.url
+        this.cd.markForCheck()
+      })
+  }
+
+  handleUrlChange(url: string) {
+    this.recordsApiService
+      .putResourceFromURL(this.metadataUuid, url, 'public')
+      .subscribe((resource) => {
+        this.resourceFileName = resource.filename
+        this.resourceUrl = resource.url
+        this.cd.markForCheck()
+      })
+  }
+
+  handleDelete() {
+    this.recordsApiService
+      .delResource(this.metadataUuid, this.resourceFileName)
+      .subscribe(() => {
+        this.resourceFileName = null
+        this.resourceUrl = null
+        this.cd.markForCheck()
+      })
+  }
+}

package/src/libs/{ui/inputs/src/lib → feature/editor/src/lib/components/record-form}/form-field/form-field-array/form-field-array.component.ts

@@ -5,5 +5,6 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'
   templateUrl: './form-field-array.component.html',
   styleUrls: ['./form-field-array.component.css'],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
 })
 export class FormFieldArrayComponent {}