geonetwork-ui 2.5.0-dev.da7bc314b → 2.5.0-dev.ee5be4e65

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

@@ -160,6 +160,38 @@ As such, **it is not very interesting at all.**`,
     extras: {
       isPublishedToAll: true,
       edit: true,
+      featureTypes: [
+        {
+          attributeTable: [
+            {
+              code: 'OBJECTID',
+              name: 'OBJECTID',
+              link: '',
+              definition: 'Object identifier',
+              type: 'OID',
+            },
+            {
+              code: 'NOM',
+              name: 'Nom',
+              link: '',
+              definition: 'Nom de la rue',
+              type: 'String (48)',
+            },
+            {
+              code: 'RUE',
+              name: 'Rue',
+              link: '',
+              definition: '',
+              type: 'String (50)',
+            },
+          ],
+          code: '',
+          aliases: '',
+          typeName: "Catalogue d'attributs",
+          definition: '',
+          isAbstract: 'false',
+        },
+      ],
     },
   },
   {
@@ -312,6 +344,49 @@ export const simpleDatasetRecordFixture = (): DatasetRecord => ({
   translations: {},
 })
 
+export const simpleDatasetRecordWithFcatsFixture = (): DatasetRecord => ({
+  uniqueIdentifier: 'my-dataset-with-fcats',
+  extras: {
+    featureCatalogIdentifier: 'feature-catalog-identifier',
+  },
+  kind: 'dataset',
+  otherLanguages: [],
+  defaultLanguage: 'en',
+  recordUpdated: new Date('2022-02-01T14:12:00.000Z'),
+  resourceCreated: new Date('2022-09-01T12:18:19.000Z'),
+  resourceUpdated: new Date('2022-12-04T14:12:00.000Z'),
+  status: 'ongoing',
+  title: 'A very interesting dataset with a related feature catalog',
+  abstract: `This dataset has been established for testing purposes.`,
+  ownerOrganization: { name: 'MyOrganization', translations: {} },
+  contacts: [
+    {
+      email: 'bob@org.net',
+      position: 'developer',
+      organization: { name: 'MyOrganization', translations: {} },
+      role: 'point_of_contact',
+      firstName: 'Bob',
+      lastName: 'TheGreat',
+    },
+  ],
+  contactsForResource: [],
+  keywords: [],
+  topics: ['testData'],
+  licenses: [],
+  legalConstraints: [],
+  securityConstraints: [],
+  otherConstraints: [],
+  lineage:
+    'This record was edited manually to test the feature catalog parsing',
+  spatialRepresentation: 'grid',
+  overviews: [],
+  spatialExtents: [],
+  temporalExtents: [],
+  onlineResources: [],
+  updateFrequency: { per: 'month', updatedTimes: 3 },
+  translations: {},
+})
+
 export const simpleDatasetRecordAsXmlFixture =
   (): string => `<?xml version="1.0" encoding="UTF-8"?>
 <mdb:MD_Metadata xmlns:mdb="http://standards.iso.org/iso/19115/-3/mdb/2.0" xmlns:mcc="http://standards.iso.org/iso/19115/-3/mcc/1.0" xmlns:gco="http://standards.iso.org/iso/19115/-3/gco/1.0" xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0" xmlns:mri="http://standards.iso.org/iso/19115/-3/mri/1.0" xmlns:mco="http://standards.iso.org/iso/19115/-3/mco/1.0" xmlns:gcx="http://standards.iso.org/iso/19115/-3/gcx/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:mmi="http://standards.iso.org/iso/19115/-3/mmi/1.0" xmlns:mrd="http://standards.iso.org/iso/19115/-3/mrd/1.0" xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0">

package/src/libs/feature/editor/src/lib/components/constraint-card/constraint-card.component.html

@@ -2,7 +2,7 @@
   <gn-ui-form-field-rich
     class="mt-[-8px]"
     [label]="label"
-    [hint]="hint | translate"
+    [placeholder]="hint | translate"
     [value]="constraint_.text ?? ''"
     (valueChange)="handleConstraintTextChange($event)"
   ></gn-ui-form-field-rich>

package/src/libs/feature/editor/src/lib/components/record-form/form-field/form-field-contacts-for-resource/form-field-contacts-for-resource.component.ts

@@ -79,6 +79,7 @@ export class FormFieldContactsForResourceComponent
     'owner',
     'point_of_contact',
     'author',
+    'publisher',
   ]
 
   roleSectionsToDisplay: Role[] = []

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

@@ -28,7 +28,7 @@ import { FormFieldWrapperComponent } from '../../../../../../../../../libs/ui/la
 export class FormFieldRichComponent {
   @Input() label: string
   @Input() hint: string
-  @Input() placeholder = 'Votre texte ici' //TODO: translate
+  @Input() placeholder = ''
   @Input() value: string
 
   @Output() valueChange: EventEmitter<string> = new EventEmitter()

package/src/libs/feature/editor/src/lib/fields.config.ts

@@ -275,8 +275,8 @@ export const DEFAULT_CONFIGURATION: EditorConfig = {
       labelKey: marker('editor.record.form.page.description'),
       sections: [
         TITLE_SECTION,
-        ABOUT_SECTION,
         CLASSIFICATION_SECTION,
+        ABOUT_SECTION,
         GEOGRAPHICAL_COVERAGE_SECTION,
       ],
     },

package/src/libs/feature/record/src/lib/state/mdview.actions.ts

@@ -2,6 +2,7 @@ import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/
 import { createAction, props } from '@ngrx/store'
 import {
   CatalogRecord,
+  DatasetFeatureCatalog,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -28,6 +29,21 @@ export const loadFullMetadataFailure = createAction(
   props<{ otherError?: string; notFound?: boolean }>()
 )
 
+export const loadFeatureCatalog = createAction(
+  "[Metadata view] Load metadata's feature catalog",
+  props<{ metadata: CatalogRecord }>()
+)
+
+export const loadFeatureCatalogSuccess = createAction(
+  '[Metadata view] Load metadata feature catalog success',
+  props<{ datasetCatalog: DatasetFeatureCatalog | null }>()
+)
+
+export const loadFeatureCatalogFailure = createAction(
+  '[Metadata view] Load metadata feature catalog failure',
+  props<{ error?: string }>()
+)
+
 export const closeMetadata = createAction('[Metadata view] close')
 
 /*

package/src/libs/feature/record/src/lib/state/mdview.effects.ts

@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core'
 import { Actions, createEffect, ofType } from '@ngrx/effects'
 import { exhaustMap, mergeMap, of } from 'rxjs'
-import { catchError, map, switchMap } from 'rxjs/operators'
+import { catchError, filter, map, switchMap, take } from 'rxjs/operators'
 import * as MdViewActions from './mdview.actions'
 import { RecordsRepositoryInterface } from '../../../../../../libs/common/domain/src/lib/repository/records-repository.interface'
 import { PlatformServiceInterface } from '../../../../../../libs/common/domain/src/lib/platform.service.interface'
-
 @Injectable()
 export class MdViewEffects {
   constructor(
@@ -33,6 +32,26 @@ export class MdViewEffects {
     )
   )
 
+  loadFeatureCatalog$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(MdViewActions.loadFullMetadataSuccess),
+      filter(({ full }) => full !== undefined),
+      switchMap(({ full }) => this.recordsRepository.getFeatureCatalog(full)),
+      map((featureCatalog) =>
+        MdViewActions.loadFeatureCatalogSuccess({
+          datasetCatalog: featureCatalog,
+        })
+      ),
+      catchError((error) =>
+        of(
+          MdViewActions.loadFeatureCatalogFailure({
+            error: error.message,
+          })
+        )
+      )
+    )
+  )
+
   /*
     Related effects
   */

package/src/libs/feature/record/src/lib/state/mdview.facade.ts

@@ -52,6 +52,8 @@ export class MdViewFacade {
     filter((md) => !!md)
   )
 
+  featureCatalog$ = this.store.pipe(select(MdViewSelectors.getFeatureCatalog))
+
   isIncomplete$ = this.store.pipe(
     select(MdViewSelectors.getMetadataIsIncomplete),
     filter((incomplete) => incomplete !== null)

package/src/libs/feature/record/src/lib/state/mdview.reducer.ts

@@ -3,6 +3,7 @@ import * as MetadataViewActions from './mdview.actions'
 import { DatavizConfigurationModel } from '../../../../../../libs/common/domain/src/lib/model/dataviz/dataviz-configuration.model'
 import {
   CatalogRecord,
+  DatasetFeatureCatalog,
   UserFeedback,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
@@ -17,6 +18,9 @@ export interface MetadataViewState {
   allUserFeedbacksLoading: boolean
   addUserFeedbackLoading: boolean
   chartConfig?: DatavizConfigurationModel
+  featureCatalog?: DatasetFeatureCatalog
+  featureCatalogLoading: boolean
+  featureCatalogError: string | null
 }
 
 export const initialMetadataViewState: MetadataViewState = {
@@ -24,6 +28,8 @@ export const initialMetadataViewState: MetadataViewState = {
   loadingFull: false,
   allUserFeedbacksLoading: false,
   addUserFeedbackLoading: false,
+  featureCatalogLoading: false,
+  featureCatalogError: null,
 }
 
 const metadataViewReducer = createReducer(
@@ -105,7 +111,30 @@ const metadataViewReducer = createReducer(
       addUserFeedbackLoading: false,
       allUserFeedbacksLoading: false,
     })
-  )
+  ),
+
+  /**
+   * FeatureCatalog reducers
+   */
+
+  on(MetadataViewActions.loadFeatureCatalog, (state) => ({
+    ...state,
+    featureCatalogError: null,
+    featureCatalogLoading: true,
+  })),
+  on(
+    MetadataViewActions.loadFeatureCatalogSuccess,
+    (state, { datasetCatalog }) => ({
+      ...state,
+      featureCatalog: datasetCatalog,
+      featureCatalogLoading: false,
+    })
+  ),
+  on(MetadataViewActions.loadFeatureCatalogFailure, (state, { error }) => ({
+    ...state,
+    featureCatalogError: error,
+    featureCatalogLoading: false,
+  }))
 )
 
 export function reducer(

package/src/libs/feature/record/src/lib/state/mdview.selectors.ts

@@ -64,3 +64,15 @@ export const getAddUserFeedbacksLoading = createSelector(
   getMdViewState,
   (state: MetadataViewState) => state.addUserFeedbackLoading
 )
+
+/*
+  Feature Catalog Selectors
+*/
+export const getFeatureCatalog = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.featureCatalog
+)
+export const getFeatureCatalogIsLoading = createSelector(
+  getMdViewState,
+  (state: MetadataViewState) => state.featureCatalogLoading
+)

package/src/libs/ui/inputs/src/lib/autocomplete/autocomplete.component.ts

@@ -147,6 +147,12 @@ export class AutocompleteComponent
         this.error = null
       }),
       switchMap((value) => this.action(value)),
+      tap((suggestions) => {
+        // forcing the panel to open if there are suggestions
+        if (suggestions.length > 0) {
+          this.triggerRef?.openPanel()
+        }
+      }),
       catchError((error: Error) => {
         this.error = error.message
         return of([])

package/translations/de.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "Geglättes Liniendiagramm",
   "chart.type.pie": "Kreisdiagramm",
   "dashboard.catalog.allRecords": "Metadatenkatalog",
-  "dashboard.catalog.contacts": "Kontakte",
-  "dashboard.catalog.thesaurus": "Thesaurus",
   "dashboard.createRecord": "Neuer Eintrag",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Meine Entwürfe",
   "dashboard.records.myRecords": "Meine Datensätze",
   "dashboard.records.search": "Suche nach \"{searchText}\"",
-  "dashboard.records.templates": "Vorlagen",
   "dashboard.records.userDetail": "Name",
   "dashboard.records.userEmail": "E-Mail",
   "dashboard.records.username": "Benutzername",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "Der Datensatz mit der Kennung \"{ id }\" konnte nicht gefunden werden.",
   "search.field.any.placeholder": "Suche Datensätze ...",
   "search.field.sortBy": "Sortieren nach:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Letzte Aktualisierung",
   "search.filters.clear": "Zurücksetzen",
   "search.filters.contact": "Kontakte",

package/translations/en.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "smooth line chart",
   "chart.type.pie": "pie chart",
   "dashboard.catalog.allRecords": "Datasets",
-  "dashboard.catalog.contacts": "Contacts",
-  "dashboard.catalog.thesaurus": "Thesaurus",
   "dashboard.createRecord": "New dataset",
   "dashboard.importRecord": "Import",
   "dashboard.importRecord.importExternal": "Import an external file",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "My drafts",
   "dashboard.records.myRecords": "My datasets",
   "dashboard.records.search": "Search for \"{searchText}\"",
-  "dashboard.records.templates": "Templates",
   "dashboard.records.userDetail": "Name",
   "dashboard.records.userEmail": "Email",
   "dashboard.records.username": "Username",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "The dataset with identifier \"{ id }\" could not be found.",
   "search.field.any.placeholder": "Search datasets ...",
   "search.field.sortBy": "Sort by:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Updated",
   "search.filters.clear": "Reset",
   "search.filters.contact": "Contacts",

package/translations/es.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "gráfico de líneas suave",
   "chart.type.pie": "gráfico circular",
   "dashboard.catalog.allRecords": "",
-  "dashboard.catalog.contacts": "",
-  "dashboard.catalog.thesaurus": "",
   "dashboard.createRecord": "",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Mis borradores",
   "dashboard.records.myRecords": "Mis Registros",
   "dashboard.records.search": "Buscar \"{searchText}\"",
-  "dashboard.records.templates": "",
   "dashboard.records.userDetail": "",
   "dashboard.records.userEmail": "",
   "dashboard.records.username": "",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "",
   "search.field.any.placeholder": "",
   "search.field.sortBy": "",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Última actualización",
   "search.filters.clear": "",
   "search.filters.contact": "",

package/translations/fr.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "ligne lisse",
   "chart.type.pie": "camembert",
   "dashboard.catalog.allRecords": "Jeux de données",
-  "dashboard.catalog.contacts": "Annuaire",
-  "dashboard.catalog.thesaurus": "Thésaurus",
   "dashboard.createRecord": "Nouveau jeu de données",
   "dashboard.importRecord": "Importer",
   "dashboard.importRecord.importExternal": "Importer un jeu de données externe",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Mes brouillons",
   "dashboard.records.myRecords": "Mes jeux de données",
   "dashboard.records.search": "Résultats pour \"{searchText}\"",
-  "dashboard.records.templates": "Modèles pré-remplis",
   "dashboard.records.userDetail": "Nom",
   "dashboard.records.userEmail": "Email",
   "dashboard.records.username": "Nom d'utilisateur",
@@ -161,7 +158,7 @@
   "domain.contact.role.point_of_contact": "Point de contact",
   "domain.contact.role.principal_investigator": "Chercheur principal",
   "domain.contact.role.processor": "Processeur",
-  "domain.contact.role.publisher": "Éditeur",
+  "domain.contact.role.publisher": "Producteur",
   "domain.contact.role.resource_provider": "Fournisseur",
   "domain.contact.role.rights_holder": "Détenteur des droits",
   "domain.contact.role.sponsor": "Sponsor",
@@ -225,7 +222,7 @@
   "editor.record.form.constraint.otherConstraints": "Autres contraintes",
   "editor.record.form.constraint.securityConstraints": "Contraintes de sécurité",
   "editor.record.form.draft.updateAlert": "Depuis la création de ce brouillon, ce jeu de données a été modifié le { date } par { user }. Publier votre version peut supprimer ses modifications. Pour éviter cela, vous pouvez annuler vos changements, ou publier votre version en connaissance de cause.",
-  "editor.record.form.field.abstract": "Résumé",
+  "editor.record.form.field.abstract": "Description",
   "editor.record.form.field.constraintsShortcuts": "",
   "editor.record.form.field.contacts.noContact": "Veuillez renseigner au moins un point de contact.",
   "editor.record.form.field.contacts.placeholder": "Choisissez un contact",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "Cette donnée n'a pu être trouvée.",
   "search.field.any.placeholder": "Rechercher un jeu de données...",
   "search.field.sortBy": "Trier par :",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Mise à jour",
   "search.filters.clear": "Réinitialiser",
   "search.filters.contact": "Contacts",

package/translations/it.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "grafico a linea liscia",
   "chart.type.pie": "grafico a torta",
   "dashboard.catalog.allRecords": "Datasets",
-  "dashboard.catalog.contacts": "Contatti",
-  "dashboard.catalog.thesaurus": "Thesauri",
   "dashboard.createRecord": "Crea un record",
   "dashboard.importRecord": "Importare",
   "dashboard.importRecord.importExternal": "Importare un dataset esterno",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Le mie bozze",
   "dashboard.records.myRecords": "I miei dati",
   "dashboard.records.search": "Risultati per \"{searchText}\"",
-  "dashboard.records.templates": "Modelli precompilati",
   "dashboard.records.userDetail": "Nome",
   "dashboard.records.userEmail": "Email",
   "dashboard.records.username": "Nome utente",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "Impossibile trovare questi dati.",
   "search.field.any.placeholder": "Cerca un dataset...",
   "search.field.sortBy": "Ordina per:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "Aggiornato",
   "search.filters.clear": "Ripristina",
   "search.filters.contact": "Contatti",

package/translations/nl.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "glad lijndiagram",
   "chart.type.pie": "cirkeldiagram",
   "dashboard.catalog.allRecords": "",
-  "dashboard.catalog.contacts": "",
-  "dashboard.catalog.thesaurus": "",
   "dashboard.createRecord": "",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Mijn concepten",
   "dashboard.records.myRecords": "Mijn Records",
   "dashboard.records.search": "Zoeken naar \"{searchText}\"",
-  "dashboard.records.templates": "",
   "dashboard.records.userDetail": "",
   "dashboard.records.userEmail": "",
   "dashboard.records.username": "",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "",
   "search.field.any.placeholder": "",
   "search.field.sortBy": "",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "",
   "search.filters.clear": "",
   "search.filters.contact": "",

package/translations/pt.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "gráfico de linha suave",
   "chart.type.pie": "gráfico de pizza",
   "dashboard.catalog.allRecords": "",
-  "dashboard.catalog.contacts": "",
-  "dashboard.catalog.thesaurus": "",
   "dashboard.createRecord": "",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Meus rascunhos",
   "dashboard.records.myRecords": "Meus Registros",
   "dashboard.records.search": "Buscar por \"{searchText}\"",
-  "dashboard.records.templates": "",
   "dashboard.records.userDetail": "",
   "dashboard.records.userEmail": "",
   "dashboard.records.username": "",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "",
   "search.field.any.placeholder": "",
   "search.field.sortBy": "",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "",
   "search.filters.clear": "",
   "search.filters.contact": "",

package/translations/sk.json

@@ -20,8 +20,6 @@
   "chart.type.lineSmooth": "vyhladený čiarový graf",
   "chart.type.pie": "koláčový graf",
   "dashboard.catalog.allRecords": "",
-  "dashboard.catalog.contacts": "",
-  "dashboard.catalog.thesaurus": "",
   "dashboard.createRecord": "",
   "dashboard.importRecord": "",
   "dashboard.importRecord.importExternal": "",
@@ -34,7 +32,6 @@
   "dashboard.records.myDraft": "Moje koncepty",
   "dashboard.records.myRecords": "Moje záznamy",
   "dashboard.records.search": "Hľadať \"{searchText}\"",
-  "dashboard.records.templates": "",
   "dashboard.records.userDetail": "Meno",
   "dashboard.records.userEmail": "Email",
   "dashboard.records.username": "Užívateľské meno",
@@ -547,6 +544,8 @@
   "search.error.recordNotFound": "Záznam s identifikátorom \"{ id }\" sa nepodarilo nájsť.",
   "search.field.any.placeholder": "Hľadať datasety ...",
   "search.field.sortBy": "Zoradiť podľa:",
+  "search.filters.availableServices.download": "",
+  "search.filters.availableServices.view": "",
   "search.filters.changeDate": "",
   "search.filters.clear": "Obnoviť",
   "search.filters.contact": "Kontakty",