geonetwork-ui 2.4.0-dev.cd525aa1 → 2.4.0-dev.d5b28b1e

package/src/libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -2,6 +2,7 @@ import { marker } from '@biesbjerg/ngx-translate-extract-marker'
 import type { Individual } from './contact.model'
 import type { Organization } from './organization.model'
 import type { Geometry } from 'geojson'
+import { KeywordType, ThesaurusModel } from '../thesaurus'
 
 type Uuid = string
 
@@ -60,18 +61,12 @@ export type SpatialRepresentationType =
   | 'table'
   | 'point'
 
-export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
-
-export type KeywordThesaurus = {
-  id: string
-  name?: string
-  url?: URL
-}
-
 export interface Keyword {
+  key?: string
   label: string
+  description?: string
   type: KeywordType
-  thesaurus?: KeywordThesaurus
+  thesaurus?: ThesaurusModel
 }
 // languages should be expressed using two-letters ISO 639-1 codes
 export type LanguageCode = string
@@ -164,7 +159,8 @@ export interface GraphicOverview {
 }
 
 export interface DatasetSpatialExtent {
-  geometry: Geometry
+  bbox?: [number, number, number, number]
+  geometry?: Geometry
   description?: string
 }
 

package/src/libs/common/domain/src/lib/model/record/organization.model.ts

@@ -1,5 +1,6 @@
 export interface Organization {
   name: string
+  email?: string
   description?: string
   website?: URL
   logoUrl?: URL

package/src/libs/common/domain/src/lib/model/thesaurus/thesaurus.model.ts

@@ -1,7 +1,14 @@
-export interface ThesaurusItemModel {
-  key: string
-  label: string
-  description?: string
-}
+export type KeywordType = 'place' | 'temporal' | 'theme' | 'other'
 
-export type ThesaurusModel = ThesaurusItemModel[]
+export interface ThesaurusModel {
+  id: string
+  name?: string
+  url?: URL
+  thesaurusKey?: string
+  definition?: string
+  definitions?: object
+  uri?: string
+  value?: string
+  values?: object
+  type?: KeywordType
+}

package/src/libs/common/domain/src/lib/platform.service.interface.ts

@@ -1,8 +1,8 @@
 import type { Observable } from 'rxjs'
 import type { UserModel } from './model/user/user.model'
 import type { Organization } from './model/record/organization.model'
-import type { ThesaurusModel } from './model/thesaurus/'
-import { UserFeedback } from './model/record'
+import { Keyword, UserFeedback } from './model/record'
+import { KeywordType } from './model/thesaurus'
 
 export abstract class PlatformServiceInterface {
   abstract getType(): string
@@ -16,7 +16,11 @@ export abstract class PlatformServiceInterface {
   ): Observable<UserModel[]>
   abstract getOrganizations(): Observable<Organization[]>
   abstract translateKey(key: string): Observable<string>
-  abstract getThesaurusByUri(uri: string): Observable<ThesaurusModel>
+  abstract searchKeywords(
+    query: string,
+    keywordTypes: KeywordType[]
+  ): Observable<Keyword[]>
+  abstract getKeywordsByUri(uri: string): Observable<Keyword[]>
   abstract getUserFeedbacks(recordUuid: string): Observable<UserFeedback[]>
   abstract postUserFeedbacks(recordUuid: UserFeedback): Observable<void>
 }

package/src/libs/common/domain/src/lib/repository/records-repository.interface.ts

@@ -30,16 +30,36 @@ export abstract class RecordsRepositoryInterface {
     uniqueIdentifier: string
   ): Observable<[CatalogRecord, string, boolean] | null>
 
+  /**
+   * This emits once:
+   * - record object with a new unique identifier and suffixed title
+   * - serialized representation of the record as text
+   * - false, as the duplicated record is always a draft
+   * @param uniqueIdentifier
+   * @returns Observable<[CatalogRecord, string, false] | null>
+   */
+  abstract openRecordForDuplication(
+    uniqueIdentifier: string
+  ): Observable<[CatalogRecord, string, false] | null>
+
   /**
    * @param record
    * @param referenceRecordSource
-   * @returns Observable<string> Returns the source of the record as it was serialized when saved
+   * @returns Observable<string> Returns the unique identifier of the record as it was when saved
    */
   abstract saveRecord(
     record: CatalogRecord,
     referenceRecordSource?: string
   ): Observable<string>
 
+  /**
+   * @param uniqueIdentifier
+   * @returns Observable<void> Returns when record is deleted
+   */
+  abstract deleteRecord(uniqueIdentifier: string): Observable<void>
+
+  abstract generateTemporaryId(): string
+
   /**
    * @param record
    * @param referenceRecordSource
@@ -52,4 +72,9 @@ export abstract class RecordsRepositoryInterface {
 
   abstract clearRecordDraft(uniqueIdentifier: string): void
   abstract recordHasDraft(uniqueIdentifier: string): boolean
+  abstract isRecordNotYetSaved(uniqueIdentifier: string): boolean
+
+  /** will return all pending drafts, both published and not published */
+  abstract getAllDrafts(): Observable<CatalogRecord[]>
+  abstract draftsChanged$: Observable<void>
 }

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

@@ -11,3 +11,5 @@ export * from './lib/records.fixtures'
 export * from './lib/repository.fixtures'
 export * from './lib/user.fixtures'
 export * from './lib/user-feedbacks.fixtures'
+
+export * from './lib/editor'

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/common/fixtures/src/lib/records.fixtures.ts

@@ -233,6 +233,14 @@ Malgré l'attention portée à la création de ces données, il est rappelé que
         description: 'Téléchargement du fichier',
         mimeType: 'x-gis/x-shapefile',
       },
+      {
+        type: 'service',
+        url: new URL('https://my-org.net/ogc'),
+        accessServiceProtocol: 'ogcFeatures',
+        name: 'ogcFeaturesSecondRecord',
+        description: 'This OGC service is the second part of the download',
+        identifierInService: 'my:featuretype',
+      },
     ],
     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.`,

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/dataviz/src/lib/feature-dataviz.module.ts

@@ -12,7 +12,7 @@ import {
 import { TableViewComponent } from './table-view/table-view.component'
 import { ChartViewComponent } from './chart-view/chart-view.component'
 import { TranslateModule } from '@ngx-translate/core'
-import { UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
+import { PopupAlertComponent, UiWidgetsModule } from '../../../../../libs/ui/widgets/src'
 import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
 
 @NgModule({
@@ -26,6 +26,7 @@ import { UiInputsModule } from '../../../../../libs/ui/inputs/src'
     TranslateModule,
     ChartComponent,
     UiInputsModule,
+    PopupAlertComponent,
   ],
   declarations: [
     GeoTableViewComponent,

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

@@ -26,3 +26,10 @@ export const saveRecordFailure = createAction(
   '[Editor] Save record failure',
   props<{ error: SaveRecordError }>()
 )
+
+export const draftSaveSuccess = createAction('[Editor] Draft save success')
+
+export const setCurrentPage = createAction(
+  '[Editor] Set current page',
+  props<{ page: number }>()
+)