geonetwork-ui 2.4.0-dev.e1bb65c4 → 2.4.0-dev.e6ae55aa

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

@@ -0,0 +1,156 @@
+export const EDITOR_CONFIG = () => ({
+  pages: [
+    {
+      labelKey: 'Resource description',
+      sections: [EDITOR_SECTION_ABOUT()],
+    },
+    {
+      labelKey: 'Resources',
+      sections: [EDITOR_SECTION_CLASSIFICATION()],
+    },
+    {
+      labelKey: 'Access and contact',
+      sections: [
+        EDITOR_SECTION_USE_AND_ACCESS_CONDITIONS(),
+        EDITOR_SECTION_DATA_MANAGER(),
+      ],
+    },
+  ],
+})
+
+export const EDITOR_SECTION_ABOUT = () => ({
+  labelKey: 'About the resource',
+  descriptionKey: 'This section describes the resource.',
+  hidden: false,
+  fields: [
+    EDITOR_FIELD_TITLE(),
+    EDITOR_FIELD_ABSTRACT(),
+    EDITOR_FIELD_RESOURCE_UPDATED(),
+    EDITOR_FIELD_RECORD_UPDATED(),
+    EDITOR_FIELD_UPDATE_FREQUENCY(),
+    EDITOR_FIELD_TEMPORAL_EXTENTS(),
+  ],
+})
+
+export const EDITOR_SECTION_DATA_MANAGER = () => ({
+  labelKey: 'Data manager',
+  descriptionKey: '',
+  hidden: false,
+  fields: [],
+})
+
+export const EDITOR_SECTION_USE_AND_ACCESS_CONDITIONS = () => ({
+  labelKey: 'Data manager',
+  descriptionKey: '',
+  hidden: false,
+  fields: [EDITOR_FIELD_LICENSE()],
+})
+
+export const EDITOR_SECTION_CLASSIFICATION = () => ({
+  labelKey: 'Classification',
+  descriptionKey: 'The classification has an impact on the access to the data.',
+  hidden: false,
+  fields: [EDITOR_FIELD_KEYWORDS(), EDITOR_FIELD_UNIQUE_IDENTIFIER()],
+})
+
+export const EDITOR_FIELD_TITLE = () => ({
+  model: 'title',
+  hidden: false,
+  value: 'Accroches vélos MEL',
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.title',
+  },
+})
+
+export const EDITOR_FIELD_ABSTRACT = () => ({
+  model: 'abstract',
+  hidden: false,
+  value: 'Abstract',
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.abstract',
+  },
+})
+
+export const EDITOR_FIELD_RESOURCE_UPDATED = () => ({
+  model: 'resourceUpdated',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.resourceUpdated',
+  },
+})
+
+export const EDITOR_FIELD_RECORD_UPDATED = () => ({
+  model: 'recordUpdated',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.recordUpdated',
+    locked: true,
+  },
+  value: '2024-07-16T05:18:53.000Z',
+  onSaveProcess: '${dateNow()}',
+})
+
+export const EDITOR_FIELD_UPDATE_FREQUENCY = () => ({
+  model: 'updateFrequency',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.updateFrequency',
+  },
+  value: 'unknown',
+})
+
+export const EDITOR_FIELD_TEMPORAL_EXTENTS = () => ({
+  model: 'temporalExtents',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.temporalExtents',
+  },
+  value: [],
+})
+
+export const EDITOR_FIELD_SPATIAL_EXTENTS = () => ({
+  model: 'spatialExtents',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.spatialExtents',
+  },
+})
+
+export const EDITOR_FIELD_KEYWORDS = () => ({
+  model: 'keywords',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.keywords',
+  },
+})
+
+export const EDITOR_FIELD_UNIQUE_IDENTIFIER = () => ({
+  model: 'uniqueIdentifier',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.uniqueIdentifier',
+    locked: true,
+  },
+  value: 'accroche_velos',
+})
+
+export const EDITOR_FIELD_LICENSE = () => ({
+  model: 'licenses',
+  hidden: false,
+  formFieldConfig: {
+    labelKey: 'editor.record.form.field.license',
+    locked: true,
+  },
+})
+
+export const EDITOR_FIELDS = () => [
+  EDITOR_FIELD_TITLE(),
+  EDITOR_FIELD_ABSTRACT(),
+  EDITOR_FIELD_RESOURCE_UPDATED(),
+  EDITOR_FIELD_RECORD_UPDATED(),
+  EDITOR_FIELD_UPDATE_FREQUENCY(),
+  EDITOR_FIELD_TEMPORAL_EXTENTS(),
+  EDITOR_FIELD_SPATIAL_EXTENTS(),
+  EDITOR_FIELD_KEYWORDS(),
+  EDITOR_FIELD_UNIQUE_IDENTIFIER(),
+]

package/src/libs/common/fixtures/src/lib/editor/index.ts

@@ -0,0 +1 @@
+export * from './editor.fixtures'

package/src/libs/common/fixtures/src/lib/organisations.fixture.ts

@@ -5,84 +5,112 @@ export const ORGANISATIONS_FIXTURE: Organization[] = deepFreeze([
   {
     name: 'I Data Org',
     description: 'one org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo1.png'),
     recordCount: 12,
   },
   {
     name: 'H Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo2.png'),
     recordCount: 15,
   },
   {
     name: 'J Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo3.png'),
     recordCount: 6,
   },
   {
     name: 'G Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo4.png'),
     recordCount: 8,
   },
   {
     name: 'B Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo5.png'),
     recordCount: 2,
   },
   {
     name: 'D Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo6.png'),
     recordCount: 17,
   },
   {
     name: 'F Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo7.png'),
     recordCount: 14,
   },
   {
     name: 'A Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo8.png'),
     recordCount: 3,
   },
   {
     name: 'C Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo9.png'),
     recordCount: 9,
   },
   {
     name: 'E Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo10.png'),
     recordCount: 1,
   },
   {
     name: 'é Data Org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo10.png'),
     recordCount: 2,
   },
   {
     name: 'wizard-org',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo11.png'),
     recordCount: 2,
   },
   {
     name: "Université de l'Ingénierie",
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
     recordCount: 2,
   },
   {
     name: 'ARS / Agence régionale de santé',
     description: 'another org for testing',
+    email: 'test@gmail.com',
+    website: new URL('https://my-geonetwork.org/'),
     logoUrl: new URL('https://my-geonetwork.org/logo12.png'),
     recordCount: 2,
   },

package/src/libs/data-access/datafeeder/src/openapi/model/datasetMetadata.api.model.ts

@@ -38,4 +38,8 @@ export interface DatasetMetadataApiModel {
    * textual description of dataset lineage
    */
   creationProcessDescription?: string
+  /**
+   * Optional, additional options for the dataset
+   */
+  options: any
 }

package/src/libs/data-access/datafeeder/src/openapi/model/datasetUploadStatus.api.model.ts

@@ -34,4 +34,6 @@ export interface DatasetUploadStatusApiModel {
    * detected charset
    */
   encoding?: string
+  format?: 'CSV' | 'SHAPEFILE'
+  options?: any
 }

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

@@ -7201,11 +7201,7 @@ export class RecordsApiService {
     }
 
     // to determine the Content-Type header
-    const consumes: string[] = [
-      'application/xml',
-      'application/json',
-      'application/x-www-form-urlencoded',
-    ]
+    const consumes: string[] = ['application/xml']
     const httpContentTypeSelected: string | undefined =
       this.configuration.selectHeaderContentType(consumes)
     if (httpContentTypeSelected !== undefined) {

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

@@ -21,7 +21,7 @@ export interface UserApiModel {
   emailAddresses?: Set<string>
   addresses?: Set<AddressApiModel>
   primaryAddress?: AddressApiModel
-  organisation?: string
+  organization?: string
   kind?: string
   lastLoginDate?: string
   authorities?: Array<GrantedAuthorityApiModel>

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

@@ -1832,14 +1832,6 @@ paths:
             schema:
               type: string
               description: XML fragment.
-          application/json:
-            schema:
-              type: string
-              description: XML fragment.
-          application/x-www-form-urlencoded:
-            schema:
-              type: string
-              description: XML fragment.
       responses:
         default:
           description: default response

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

@@ -1,4 +1,5 @@
 export * from './lib/feature-catalog.module'
+export * from './lib/organization-url.token'
 export * from './lib/sources/sources.service'
 export * from './lib/sources/sources.model'
 export * from './lib/records/records.service'

package/src/libs/feature/catalog/src/lib/feature-catalog.module.ts

@@ -4,7 +4,6 @@ import { UiCatalogModule } from '../../../../../libs/ui/catalog/src'
 import {
   GroupsApiService,
   SearchApiService,
-  SiteApiService,
 } from '../../../../../libs/data-access/gn4/src'
 import { CommonModule } from '@angular/common'
 import { SourceLabelComponent } from './source-label/source-label.component'

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.html

@@ -19,7 +19,7 @@
     [showContent]="!!organisation.name"
   >
     <gn-ui-organisation-preview
-      [organisation]="organisation"
+      [organization]="organisation"
       [organisationUrl]="getOrganisationUrl(organisation)"
       (clickedOrganisation)="orgSelect.emit($event)"
     ></gn-ui-organisation-preview>

package/src/libs/feature/catalog/src/lib/organisations/organisations.component.ts

@@ -10,10 +10,10 @@ import {
 import { Organization } from '../../../../../../libs/common/domain/src/lib/model/record'
 import { BehaviorSubject, combineLatest, Observable } from 'rxjs'
 import { map, startWith, tap } from 'rxjs/operators'
-import { ORGANIZATION_URL_TOKEN } from '../feature-catalog.module'
 import { OrganizationsServiceInterface } from '../../../../../../libs/common/domain/src/lib/organizations.service.interface'
 import { SortByField } from '../../../../../../libs/common/domain/src/lib/model/search'
 import { createFuzzyFilter } from '../../../../../../libs/util/shared/src'
+import { ORGANIZATION_PAGE_URL_TOKEN } from '../organization-url.token'
 
 @Component({
   selector: 'gn-ui-organisations',
@@ -28,7 +28,7 @@ export class OrganisationsComponent {
   constructor(
     private organisationsService: OrganizationsServiceInterface,
     @Optional()
-    @Inject(ORGANIZATION_URL_TOKEN)
+    @Inject(ORGANIZATION_PAGE_URL_TOKEN)
     private urlTemplate: string
   ) {}
 

package/src/libs/feature/catalog/src/lib/organization-url.token.ts

@@ -0,0 +1,6 @@
+import { InjectionToken } from '@angular/core'
+
+// expects the replacement key ${name}
+export const ORGANIZATION_PAGE_URL_TOKEN = new InjectionToken<string>(
+  'organization-page-url-token'
+)

package/src/libs/feature/catalog/src/lib/records/records.service.ts

@@ -1,18 +1,16 @@
 import { Injectable } from '@angular/core'
-import { Observable, of } from 'rxjs'
-import { catchError, shareReplay } from 'rxjs/operators'
+import { Observable, of, switchMap } from 'rxjs'
+import { shareReplay } from 'rxjs/operators'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
 @Injectable({
   providedIn: 'root',
 })
 export class RecordsService {
-  recordsCount$: Observable<number> = this.recordsRepository
-    .getMatchesCount({})
-    .pipe(
-      shareReplay(1),
-      catchError(() => of(0))
-    )
+  recordsCount$: Observable<number> = of(true).pipe(
+    switchMap(() => this.recordsRepository.getMatchesCount({})),
+    shareReplay(1)
+  )
 
   constructor(private recordsRepository: RecordsRepositoryInterface) {}
 }

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

@@ -28,3 +28,8 @@ export const saveRecordFailure = createAction(
 )
 
 export const draftSaveSuccess = createAction('[Editor] Draft save success')
+
+export const setCurrentPage = createAction(
+  '[Editor] Set current page',
+  props<{ page: number }>()
+)

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

@@ -6,9 +6,9 @@ import * as EditorActions from './editor.actions'
 import { EditorService } from '../services/editor.service'
 import { Store } from '@ngrx/store'
 import {
+  selectEditorConfig,
   selectRecord,
   selectRecordAlreadySavedOnce,
-  selectRecordFieldsConfig,
 } from './editor.selectors'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 
@@ -24,7 +24,7 @@ export class EditorEffects {
       ofType(EditorActions.saveRecord),
       withLatestFrom(
         this.store.select(selectRecord),
-        this.store.select(selectRecordFieldsConfig),
+        this.store.select(selectEditorConfig),
         this.store.select(selectRecordAlreadySavedOnce)
       ),
       switchMap(([, record, fieldsConfig, alreadySavedOnce]) =>

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

@@ -25,8 +25,12 @@ export class EditorFacade {
   changedSinceSave$ = this.store.pipe(
     select(EditorSelectors.selectRecordChangedSinceSave)
   )
-  recordFields$ = this.store.pipe(select(EditorSelectors.selectRecordFields))
+  currentSections$ = this.store.pipe(
+    select(EditorSelectors.selectRecordSections)
+  )
   draftSaveSuccess$ = this.actions$.pipe(ofType(EditorActions.draftSaveSuccess))
+  currentPage$ = this.store.pipe(select(EditorSelectors.selectCurrentPage))
+  editorConfig$ = this.store.pipe(select(EditorSelectors.selectEditorConfig))
 
   openRecord(
     record: CatalogRecord,
@@ -45,4 +49,8 @@ export class EditorFacade {
   updateRecordField(field: string, value: unknown) {
     this.store.dispatch(EditorActions.updateRecordField({ field, value }))
   }
+
+  setCurrentPage(page: number) {
+    this.store.dispatch(EditorActions.setCurrentPage({ page }))
+  }
 }

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

@@ -1 +1,12 @@
+import { EditorField, EditorFieldValue, EditorSection } from '../models'
+
 export type SaveRecordError = string
+
+export interface EditorFieldWithValue {
+  config: EditorField
+  value: EditorFieldValue
+}
+
+export type EditorSectionWithValues = EditorSection & {
+  fieldsWithValues: EditorFieldWithValue[]
+}

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

@@ -2,8 +2,8 @@ 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'
+import { EditorConfig } from '../models'
+import { DEFAULT_CONFIGURATION } from '../fields.config'
 
 export const EDITOR_FEATURE_KEY = 'editor'
 
@@ -13,7 +13,7 @@ export const EDITOR_FEATURE_KEY = 'editor'
  * @property saving
  * @property saveError
  * @property changedSinceSave
- * @property fieldsConfig Configuration for the fields in the editor
+ * @property editorConfig Configuration for the fields in the editor
  */
 export interface EditorState {
   record: CatalogRecord | null
@@ -22,7 +22,8 @@ export interface EditorState {
   saving: boolean
   saveError: SaveRecordError | null
   changedSinceSave: boolean
-  fieldsConfig: EditorFieldsConfig
+  editorConfig: EditorConfig
+  currentPage: number
 }
 
 export interface EditorPartialState {
@@ -36,7 +37,8 @@ export const initialEditorState: EditorState = {
   saving: false,
   saveError: null,
   changedSinceSave: false,
-  fieldsConfig: DEFAULT_FIELDS,
+  editorConfig: DEFAULT_CONFIGURATION,
+  currentPage: 0,
 }
 
 const reducer = createReducer(
@@ -77,6 +79,10 @@ const reducer = createReducer(
   on(EditorActions.markRecordAsChanged, (state) => ({
     ...state,
     changedSinceSave: true,
+  })),
+  on(EditorActions.setCurrentPage, (state, { page }) => ({
+    ...state,
+    currentPage: page,
   }))
 )
 

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

@@ -1,5 +1,6 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store'
 import { EDITOR_FEATURE_KEY, EditorState } from './editor.reducer'
+import { EditorSectionWithValues } from './editor.models'
 
 export const selectEditorState =
   createFeatureSelector<EditorState>(EDITOR_FEATURE_KEY)
@@ -34,16 +35,29 @@ export const selectRecordAlreadySavedOnce = createSelector(
   (state: EditorState) => state.alreadySavedOnce
 )
 
-export const selectRecordFieldsConfig = createSelector(
+export const selectEditorConfig = createSelector(
   selectEditorState,
-  (state: EditorState) => state.fieldsConfig
+  (state: EditorState) => state.editorConfig
 )
 
-export const selectRecordFields = createSelector(
+export const selectCurrentPage = createSelector(
   selectEditorState,
-  (state: EditorState) =>
-    state.fieldsConfig.map((fieldConfig) => ({
-      config: fieldConfig,
-      value: state.record?.[fieldConfig.model] ?? null,
-    }))
+  (state: EditorState) => state.currentPage
+)
+
+export const selectRecordSections = createSelector(
+  selectEditorState,
+  (state: EditorState) => {
+    const currentPage = state.editorConfig.pages[state.currentPage]
+    if (!currentPage) {
+      return [] as EditorSectionWithValues[]
+    }
+    return currentPage.sections.map((section) => ({
+      ...section,
+      fieldsWithValues: section.fields.map((fieldConfig) => ({
+        config: fieldConfig,
+        value: state.record?.[fieldConfig.model] ?? null,
+      })),
+    })) as EditorSectionWithValues[]
+  }
 )

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

@@ -35,13 +35,15 @@ export class FormFieldKeywordsComponent {
   }
 
   autoCompleteAction = (query: string) => {
-    return this.platformService.searchKeywords(query).pipe(
-      map((keywords) =>
-        keywords.map((keyword) => {
-          return { title: keyword.label, value: keyword }
-        })
+    return this.platformService
+      .searchKeywords(query, ['temporal', 'theme', 'other'])
+      .pipe(
+        map((keywords) =>
+          keywords.map((keyword) => {
+            return { title: keyword.label, value: keyword }
+          })
+        )
       )
-    )
   }
 
   constructor(private platformService: PlatformServiceInterface) {}

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

@@ -4,8 +4,8 @@
   </ng-container>
   <ng-template #withGenericWrapper>
     <gn-ui-form-field-wrapper
-      [label]="config.labelKey | translate"
-      [hint]="config.hintKey | translate"
+      [label]="config.labelKey! | translate"
+      [hint]="config.hintKey! | translate"
     >
       <ng-container *ngTemplateOutlet="fieldContent"></ng-container>
     </gn-ui-form-field-wrapper>
@@ -15,14 +15,14 @@
 <ng-template #fieldContent>
   <ng-container *ngIf="isTitle">
     <div class="flex justify-between items-center gap-3">
-      <h2
+      <span
         #titleInput
-        class="grow text-3xl font-normal"
+        class="grow font-title text-3xl font-normal"
         [gnUiEditableLabel]="true"
         (editableLabelChanged)="formControl.setValue($event)"
       >
         {{ formControl.value }}
-      </h2>
+      </span>
       <span
         class="material-symbols-outlined gn-ui-icon-small m-2 cursor-pointer"
         (click)="focusTitleInput()"
@@ -30,7 +30,7 @@
       >
       <span
         class="material-symbols-outlined gn-ui-icon-small m-2"
-        [matTooltip]="config.hintKey | translate"
+        [matTooltip]="config.hintKey! | translate"
         matTooltipPosition="above"
       >
         help
@@ -41,14 +41,14 @@
     <gn-ui-form-field-rich
       class="h-[8rem]"
       [control]="formControl"
-      [label]="config.labelKey | translate"
-      [hint]="config.hintKey | translate"
+      [label]="config.labelKey! | translate"
+      [hint]="config.hintKey! | translate"
     ></gn-ui-form-field-rich>
   </ng-container>
   <ng-container *ngIf="isLicenses">
     <gn-ui-form-field-license
       [control]="formControl"
-      [label]="config.labelKey | translate"
+      [label]="config.labelKey! | translate"
     ></gn-ui-form-field-license>
   </ng-container>
   <ng-container *ngIf="isResourceUpdated">