geonetwork-ui 2.10.0-dev.b5836aad7 → 2.10.0-dev.cc63fa135

package/src/libs/util/app-config/src/lib/app-config.ts

@@ -1,6 +1,7 @@
 import * as TOML from '@ltd/j-toml'
 import {
   checkMetadataLanguage,
+  checkNewRecordDefaultLanguage,
   parseConfigSection,
   parseMultiConfigSection,
   parseTranslationsConfigSection,
@@ -8,6 +9,7 @@ import {
 import {
   CustomTranslations,
   CustomTranslationsAllLanguages,
+  EditorConfig,
   GlobalConfig,
   LayerConfig,
   MapConfig,
@@ -51,6 +53,12 @@ export function getOptionalSearchConfig(): SearchConfig | null {
   return searchConfig
 }
 
+let editorConfig: EditorConfig = null
+
+export function getOptionalEditorConfig(): EditorConfig | null {
+  return editorConfig
+}
+
 let metadataQualityConfig: MetadataQualityConfig = null
 export function getMetadataQualityConfig(): MetadataQualityConfig {
   return (
@@ -285,6 +293,33 @@ export function loadAppConfig(configUrl = 'assets/configuration/default.toml') {
               SORTABLE: parsedMetadataQualitySection.sortable,
             } as MetadataQualityConfig)
 
+      let parsedEditingSection = parseConfigSection(
+        parsed,
+        'editing',
+        [],
+        ['new_record_default_language'],
+        warnings,
+        errors
+      )
+      if (
+        parsedEditingSection !== null &&
+        parsedEditingSection.new_record_default_language !== undefined
+      ) {
+        parsedEditingSection = checkNewRecordDefaultLanguage(
+          parsedEditingSection,
+          warnings
+        )
+      }
+      editorConfig =
+        parsedEditingSection === null
+          ? null
+          : ({
+              NEW_RECORD_DEFAULT_LANGUAGE:
+                parsedEditingSection.new_record_default_language as
+                  | string
+                  | undefined,
+            } as EditorConfig)
+
       customTranslations = parseTranslationsConfigSection(
         parsed,
         'translations'
@@ -309,6 +344,7 @@ export function isConfigLoaded() {
 export function _reset() {
   globalConfig = null
   themeConfig = null
+  editorConfig = null
   customTranslations = null
 }
 

package/src/libs/util/app-config/src/lib/model.ts

@@ -69,6 +69,10 @@ export interface MetadataQualityConfig {
   ENABLED: boolean
 }
 
+export interface EditorConfig {
+  NEW_RECORD_DEFAULT_LANGUAGE?: string
+}
+
 export type CustomTranslations = { [translationKey: string]: string }
 export type CustomTranslationsAllLanguages = {
   [lang: string]: CustomTranslations

package/src/libs/util/app-config/src/lib/parse-utils.ts

@@ -1,4 +1,4 @@
-import { toLang2 } from '../../../../../libs/util/i18n/src'
+import { LANG_2_TO_3_MAPPER, toLang2 } from '../../../../../libs/util/i18n/src'
 
 const flatten = (
   base: string,
@@ -137,3 +137,25 @@ export function checkMetadataLanguage(
   }
   return parsedConfigSection
 }
+
+export function checkNewRecordDefaultLanguage(
+  parsedConfigSection: any,
+  outWarnings: string[]
+) {
+  const lang2 = toLang2(
+    parsedConfigSection.new_record_default_language.toLowerCase()
+  )
+  if (!(lang2 in LANG_2_TO_3_MAPPER)) {
+    outWarnings.push(
+      `In the [editing] section: new_record_default_language = "${parsedConfigSection.new_record_default_language}" is not a recognized ISO 639 language code`
+    )
+    return {
+      ...parsedConfigSection,
+      new_record_default_language: undefined,
+    }
+  }
+  return {
+    ...parsedConfigSection,
+    new_record_default_language: lang2,
+  }
+}

package/src/libs/util/shared/src/lib/record/quality-score.util.ts

@@ -3,27 +3,41 @@ import {
   RecordKind,
 } from '../../../../../../libs/common/domain/src/lib/model/record'
 
+type TValidatorEntry = {
+  validator: (metadata: Partial<CatalogRecord>) => boolean
+  alias?: string
+}
+
 type TValidatorMapper = {
-  [key: string]: (metadata: Partial<CatalogRecord>) => boolean
+  [key: string]: TValidatorEntry
 }
 
 const ValidatorMapper: TValidatorMapper = {
-  title: (record) => !!record?.title,
-  abstract: (record) => !!record?.abstract,
-  keywords: (record) => (record?.keywords?.length ?? 0) > 0,
-  legalConstraints: (record) =>
-    !!(
-      record?.legalConstraints?.length &&
-      record.legalConstraints.some((c) => c?.text?.trim().length > 0)
-    ),
-  contacts: (record) =>
-    !!record?.contacts?.[0]?.email &&
-    record.contacts[0].email !== 'missing@missing.com',
-  updateFrequency: (record) =>
-    !!record?.updateFrequency && record.updateFrequency !== 'unknown',
-  topics: (record) => (record?.topics?.length ?? 0) > 0,
-  organisation: (record) => !!record?.contacts?.[0]?.organization?.name,
-  source: (record) => !!record?.extras?.sourcesIdentifiers,
+  title: { validator: (record) => !!record?.title },
+  abstract: { validator: (record) => !!record?.abstract },
+  keywords: { validator: (record) => (record?.keywords?.length ?? 0) > 0 },
+  legalConstraints: {
+    validator: (record) =>
+      !!(
+        record?.legalConstraints?.length &&
+        record.legalConstraints.some((c) => c?.text?.trim().length > 0)
+      ),
+  },
+  contacts: {
+    validator: (record) =>
+      !!record?.contacts?.[0]?.email &&
+      record.contacts[0].email !== 'missing@missing.com',
+  },
+  updateFrequency: {
+    validator: (record) =>
+      !!record?.updateFrequency && record.updateFrequency !== 'unknown',
+  },
+  topics: { validator: (record) => (record?.topics?.length ?? 0) > 0 },
+  organisation: {
+    validator: (record) => !!record?.contacts?.[0]?.organization?.name,
+    alias: 'contacts',
+  },
+  source: { validator: (record) => !!record?.extras?.sourcesIdentifiers },
 } as const
 
 export type ValidatorMapperKeys = keyof typeof ValidatorMapper & string
@@ -67,6 +81,7 @@ export function getQualityValidators(
 
   return filteredProps.map((name) => ({
     name,
-    validator: () => ValidatorMapper[name](record),
+    validator: () => ValidatorMapper[name].validator(record),
+    alias: ValidatorMapper[name].alias,
   }))
 }

package/src/libs/util/shared/src/lib/utils/index.ts

@@ -13,3 +13,4 @@ export * from './sort-by'
 export * from './strip-html'
 export * from './temporal-extent-union'
 export * from './url'
+export * from './user-display'

package/src/libs/util/shared/src/lib/utils/user-display.ts

@@ -0,0 +1,32 @@
+import { UserModel } from '../../../../../../libs/common/domain/src/lib/model/user'
+import { Individual } from '../../../../../../libs/common/domain/src/lib/model/record'
+
+export function getIndividualDisplayName(individual: Individual): string {
+  const nameParts = [individual.firstName, individual.lastName]
+    .filter(Boolean)
+    .join(' ')
+  const orgPart = individual.organization?.name
+    ? ` (${individual.organization.name})`
+    : ''
+  if (nameParts) return `${nameParts}${orgPart}`
+  return individual.organization?.name ?? individual.email ?? ''
+}
+
+export function getAddressLines(address: string | undefined): string[] {
+  return address
+    ? address
+        .split(',')
+        .map((part) => part.trim())
+        .filter(Boolean)
+    : []
+}
+
+export function toIndividual(user: UserModel): Individual {
+  return {
+    firstName: user.name,
+    lastName: user.surname,
+    email: user.email,
+    role: 'unspecified',
+    organization: user.organisation ? { name: user.organisation } : undefined,
+  }
+}

package/tailwind.base.css

@@ -74,7 +74,10 @@
     --bg-hover: var(--gn-ui-button-bg-hover, var(--color-background));
     --font-size: var(--gn-ui-button-font-size, 1em);
     --color: var(--gn-ui-button-color, var(--color-main));
-    @apply flex flex-row items-center justify-center
+    --disabled-opacity: var(--gn-ui-button-disabled-opacity, 0.5);
+    --justify: var(--gn-ui-button-justify, center);
+    justify-content: var(--justify);
+    @apply flex flex-row items-center
       text-[length:--font-size] leading-none
       text-[color:--color]
       p-[--padding] rounded-[--rounded] w-[--width] h-[--height] overflow-hidden
@@ -82,7 +85,7 @@
       hover:bg-[--bg-hover] focus:bg-[--bg-hover] active:bg-[--background]
       outline-none
       relative
-      disabled:opacity-50 disabled:pointer-events-none
+      disabled:opacity-[--disabled-opacity] disabled:pointer-events-none
       focus:z-10 active:z-10 hover:z-10;
   }
   /* makes sure icons will not make the buttons grow vertically */
@@ -134,6 +137,12 @@
       bg-white border-white focus:ring-4 focus:ring-gray-300;
   }
 
+  .gn-ui-btn-primary-light {
+    @apply gn-ui-btn text-primary-darkest
+      bg-primary-white hover:bg-primary focus:bg-primary hover:text-white focus:text-white active:bg-primary-darker
+      border-transparent;
+  }
+
   .gn-ui-card-s {
     @apply min-h-[64px] w-full xs:min-w-[260px] xs:max-w-[280px] sm:min-w-[300px] sm:max-w-[500px] md:min-w-[230px];
   }

package/translations/de.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Rechtliche Einschränkung",
   "editor.record.form.field.license": "Lizenz",
   "editor.record.form.field.onlineLinkResources": "Beigefügte Ressourcen",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Abbrechen",
   "editor.record.form.field.onlineResource.confirm": "Bestätigen",
   "editor.record.form.field.onlineResource.dialogTitle": "Vorschau des Datensatzes bearbeiten",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "Aktualisierungsfrequenz nicht angegeben",
   "record.metadata.quality.updateFrequency.success": "Aktualisierungsfrequenz angegeben",
   "record.metadata.related": "Entdecken Sie den Katalog",
+  "record.metadata.resource.contacts": "Kontakte zur Ressource",
   "record.metadata.resourceCreated": "Erstellt",
   "record.metadata.resourcePublished": "Veröffentlicht",
   "record.metadata.resourceUpdated": "Zuletzt aktualisiert",

package/translations/en.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Legal constraint",
   "editor.record.form.field.license": "License",
   "editor.record.form.field.onlineLinkResources": "Attached resources",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Cancel",
   "editor.record.form.field.onlineResource.confirm": "Confirm",
   "editor.record.form.field.onlineResource.dialogTitle": "Modify the dataset preview",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "Update frequency is not specified",
   "record.metadata.quality.updateFrequency.success": "Update frequency is specified",
   "record.metadata.related": "Explore the catalog",
+  "record.metadata.resource.contacts": "Contacts for the resource",
   "record.metadata.resourceCreated": "Created",
   "record.metadata.resourcePublished": "Published",
   "record.metadata.resourceUpdated": "Last updated",

package/translations/es.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.resource.contacts": "",
   "record.metadata.resourceCreated": "",
   "record.metadata.resourcePublished": "",
   "record.metadata.resourceUpdated": "",

package/translations/fr.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Contrainte légale",
   "editor.record.form.field.license": "Licence",
   "editor.record.form.field.onlineLinkResources": "Ressources attachées",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Lien",
   "editor.record.form.field.onlineResource.cancel": "Annuler",
   "editor.record.form.field.onlineResource.confirm": "Valider",
   "editor.record.form.field.onlineResource.dialogTitle": "Modifier l'aperçu du jeu de données",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "La fréquence de mise à jour n'est pas renseignée",
   "record.metadata.quality.updateFrequency.success": "La fréquence de mise à jour est renseignée",
   "record.metadata.related": "Explorez le catalogue",
+  "record.metadata.resource.contacts": "Contacts liés à la donnée",
   "record.metadata.resourceCreated": "Créé",
   "record.metadata.resourcePublished": "Publié",
   "record.metadata.resourceUpdated": "Mis à jour",

package/translations/it.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "Vincolo legale",
   "editor.record.form.field.license": "Licenza",
   "editor.record.form.field.onlineLinkResources": "Risorse allegate",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "Link",
   "editor.record.form.field.onlineResource.cancel": "Annulla",
   "editor.record.form.field.onlineResource.confirm": "Convalida",
   "editor.record.form.field.onlineResource.dialogTitle": "Modifica anteprima dataset",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "La frequenza di aggiornamento non è specificata",
   "record.metadata.quality.updateFrequency.success": "La frequenza di aggiornamento è specificata",
   "record.metadata.related": "Vedi anche",
+  "record.metadata.resource.contacts": "Contatti per la risorsa",
   "record.metadata.resourceCreated": "Creato",
   "record.metadata.resourcePublished": "Pubblicato",
   "record.metadata.resourceUpdated": "Ultimo aggiornamento",

package/translations/nl.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.resource.contacts": "",
   "record.metadata.resourceCreated": "",
   "record.metadata.resourcePublished": "",
   "record.metadata.resourceUpdated": "",

package/translations/pt.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "",
   "record.metadata.quality.updateFrequency.success": "",
   "record.metadata.related": "",
+  "record.metadata.resource.contacts": "",
   "record.metadata.resourceCreated": "",
   "record.metadata.resourcePublished": "",
   "record.metadata.resourceUpdated": "",

package/translations/sk.json

@@ -159,6 +159,7 @@
   "editor.record.form.field.legalConstraints": "",
   "editor.record.form.field.license": "Licencia",
   "editor.record.form.field.onlineLinkResources": "",
+  "editor.record.form.field.onlineLinkageResource.defaultName": "",
   "editor.record.form.field.onlineResource.cancel": "",
   "editor.record.form.field.onlineResource.confirm": "",
   "editor.record.form.field.onlineResource.dialogTitle": "",
@@ -520,6 +521,7 @@
   "record.metadata.quality.updateFrequency.failed": "Frekvencia aktualizácie nie je určená",
   "record.metadata.quality.updateFrequency.success": "Frekvencia aktualizácie je určená",
   "record.metadata.related": "Súvisiace záznamy",
+  "record.metadata.resource.contacts": "Kontakty k zdroju",
   "record.metadata.resourceCreated": "",
   "record.metadata.resourcePublished": "",
   "record.metadata.resourceUpdated": "",