WIP

Author: AlitaBernachot

libs/api/metadata-converter/src/lib/iso19115-3/read-parts.ts

@@ -185,15 +185,15 @@ export function extractOrganizationIndividuals(
       els.length
         ? els.map((el) => extractIndividual(role, org, orgContact)(el))
         : [
-          {
-            email: orgContact.email,
-            ...(orgContact.address && { address: orgContact.address }),
-            ...(orgContact.phone && { phone: orgContact.phone }),
-            ...(orgContact.position && { position: orgContact.position }),
-            organization: org,
-            role,
-          },
-        ]
+            {
+              email: orgContact.email,
+              ...(orgContact.address && { address: orgContact.address }),
+              ...(orgContact.phone && { phone: orgContact.phone }),
+              ...(orgContact.position && { position: orgContact.position }),
+              organization: org,
+              role,
+            },
+          ]
     )
   )
 }
@@ -394,13 +394,3 @@ export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
     )
   )(rootEl)
 }
-
-export function readRawLanguageCode(): ChainableFunction<
-  XmlElement,
-  string | null
-> {
-  return pipe(
-    findChildElement('lan:LanguageCode'),
-    readAttribute('codeListValue')
-  )
-}

libs/api/metadata-converter/src/lib/iso19115-3/write-parts.ts

@@ -49,12 +49,8 @@ import {
 } from '../iso19139/write-parts'
 import { findIdentification } from '../iso19139/read-parts'
 import { namePartsToFull } from '../iso19139/utils/individual-name'
-import {
-  LANG_2_TO_3_MAPPER,
-  LANG_3_TO_2_MAPPER,
-} from '@geonetwork-ui/util/i18n/language-codes'
+import { LANG_2_TO_3_MAPPER } from '@geonetwork-ui/util/i18n/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
-import { readOtherLanguages, readRawLanguageCode } from './read-parts'
 
 export function writeUniqueIdentifier(
   record: CatalogRecord,
@@ -558,17 +554,6 @@ export function writeDefaultLanguage(
 }
 
 export function writeOtherLanguages(record: DatasetRecord, rootEl: XmlElement) {
-  // make sure to keep unsupported languages
-  const existingLanguages = pipe(
-    findChildrenElement('mdb:otherLocale', false),
-    mapArray(readRawLanguageCode())
-  )(rootEl)
-
-  const mergedLanguages = [
-    ...record.otherLanguages,
-    ...existingLanguages.filter((lang) => !LANG_3_TO_2_MAPPER[lang]),
-  ]
-
   // clear existing
   removeChildrenByName('mdb:otherLocale')(rootEl)
 
@@ -578,7 +563,7 @@ export function writeOtherLanguages(record: DatasetRecord, rootEl: XmlElement) {
   }
 
   appendChildren(
-    ...mergedLanguages.map((lang: LanguageCode) =>
+    ...record.otherLanguages.map((lang: LanguageCode) =>
       pipe(createElement('mdb:otherLocale'), writeLocaleElement(lang))
     )
   )(rootEl)

libs/api/metadata-converter/src/lib/iso19139/read-parts.ts

@@ -1156,16 +1156,6 @@ export function readSpatialExtents(rootEl: XmlElement) {
   )(rootEl)
 }
 
-export function readRawLanguageCode(): ChainableFunction<
-  XmlElement,
-  string | null
-> {
-  return pipe(
-    findChildElement('lan:LanguageCode'),
-    readAttribute('codeListValue')
-  )
-}
-
 export function readOtherLanguages(rootEl: XmlElement): LanguageCode[] {
   const defaultLanguage = readDefaultLanguage(rootEl)
   return pipe(

libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -50,13 +50,10 @@ import {
   writeAttribute,
   XmlElement,
 } from '../xml-utils'
-import { readKind, readOtherLanguages, readRawLanguageCode } from './read-parts'
+import { readKind } from './read-parts'
 import { writeGeometry } from './utils/geometry'
 import { namePartsToFull } from './utils/individual-name'
-import {
-  LANG_2_TO_3_MAPPER,
-  LANG_3_TO_2_MAPPER,
-} from '@geonetwork-ui/util/i18n/language-codes'
+import { LANG_2_TO_3_MAPPER } from '@geonetwork-ui/util/i18n/language-codes'
 import { kindToCodeListValue } from '../common/resource-types'
 
 function writeLocalizedElement(
@@ -1460,16 +1457,6 @@ export function writeSpatialExtents(record: DatasetRecord, rootEl: XmlElement) {
 }
 
 export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
-  // make sure to keep unsupported languages
-  const existingLanguages = pipe(
-    findChildrenElement('gmd:locale', false),
-    mapArray(readRawLanguageCode())
-  )(rootEl)
-
-  const mergedLanguages = [
-    ...record.otherLanguages,
-    ...existingLanguages.filter((lang) => !LANG_3_TO_2_MAPPER[lang]),
-  ]
   // clear existing
   removeChildrenByName('gmd:locale')(rootEl)
 
@@ -1493,7 +1480,7 @@ export function writeLanguages(record: DatasetRecord, rootEl: XmlElement) {
   // add new languages (only if other than default one)
   appendChildren(
     createLanguageEl(record.defaultLanguage),
-    ...mergedLanguages.map(createLanguageEl)
+    ...record.otherLanguages.map(createLanguageEl)
   )(rootEl)
 }
 

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

@@ -60,3 +60,8 @@ export const canEditRecord = createAction(
   '[Editor] User can edit record',
   props<{ canEditRecord: boolean }>()
 )
+
+export const currentLanguage = createAction(
+  '[Editor] Current eidtion fields language changes',
+  props<{ currentLanguage: string | null }>()
+)

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

@@ -34,6 +34,9 @@ export class EditorFacade {
   )
   isPublished$ = this.store.pipe(select(EditorSelectors.selectIsPublished))
   canEditRecord$ = this.store.pipe(select(EditorSelectors.selectCanEditRecord))
+  currentLanguage$ = this.store.pipe(
+    select(EditorSelectors.selectCurrentLanguage)
+  )
 
   openRecord(record: CatalogRecord, recordSource: string) {
     this.store.dispatch(
@@ -76,4 +79,8 @@ export class EditorFacade {
   canEditRecord(canEditRecord: boolean) {
     this.store.dispatch(EditorActions.canEditRecord({ canEditRecord }))
   }
+
+  currentLanguage(currentLanguage: string) {
+    this.store.dispatch(EditorActions.currentLanguage({ currentLanguage }))
+  }
 }

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

@@ -26,6 +26,7 @@ export interface EditorState {
   hasRecordChanged: { user: string; date: Date }
   isPublished: boolean
   canEditRecord: boolean
+  currentLanguage: string | null
 }
 
 export interface EditorPartialState {
@@ -43,6 +44,7 @@ export const initialEditorState: EditorState = {
   hasRecordChanged: null,
   isPublished: true,
   canEditRecord: true,
+  currentLanguage: null,
 }
 
 const reducer = createReducer(
@@ -52,6 +54,7 @@ const reducer = createReducer(
     changedSinceSave: false,
     recordSource: recordSource ?? null,
     record,
+    currentLanguage: null,
   })),
   on(EditorActions.saveRecord, (state) => ({
     ...state,

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

@@ -71,3 +71,8 @@ export const selectCanEditRecord = createSelector(
   selectEditorState,
   (state: EditorState) => state.canEditRecord
 )
+
+export const selectCurrentLanguage = createSelector(
+  selectEditorState,
+  (state: EditorState) => state.currentLanguage
+)

libs/feature/editor/src/lib/components/multilingual-panel/multilingual-panel.component.ts

@@ -79,14 +79,13 @@ export class MultilingualPanelComponent implements OnDestroy {
   editTranslations: boolean
   selectedLanguages = []
   recordLanguages = []
-  formLanguage = ''
   @Input() set record(value: CatalogRecord) {
     this._record = value
     this.isMultilingual = value.otherLanguages.length > 0
     this.editTranslations = false
     this.recordLanguages = [...value.otherLanguages, value.defaultLanguage]
     this.selectedLanguages = this.recordLanguages
-    this.formLanguage = value.defaultLanguage
+    this.setCurrentLanguage(value.defaultLanguage)
   }
   @ViewChildren('actionMenuButton', { read: ElementRef })
   actionMenuButtons!: QueryList<ElementRef>

translations/de.json

@@ -601,4 +601,4 @@
   "wfs.unreachable.cors": "Der Dienst konnte aufgrund von CORS-Beschränkungen nicht erreicht werden",
   "wfs.unreachable.http": "Der Dienst hat einen HTTP-Fehler zurückgegeben",
   "wfs.unreachable.unknown": "Der Dienst konnte nicht erreicht werden"
-}
+}