Merged in task/main-cris/DSC-1236 (pull request DSpace#3763)

[DSC-1236] add language support to metadata group handling

Approved-by: Andrea Barbasso

Author: atarix83

src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/modal/dynamic-relation-group-modal.components.ts

@@ -143,7 +143,7 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp
     if (this.item) {
       this.formModel.forEach((row) => {
         const modelRow = row as DynamicFormGroupModel;
-        modelRow.group.forEach((model: DynamicInputModel) => {
+        modelRow.group.forEach((model: DsDynamicInputModel) => {
           const value = (this.item[model.name] === PLACEHOLDER_PARENT_METADATA
             || this.item[model.name].value === PLACEHOLDER_PARENT_METADATA)
             ? null
@@ -152,6 +152,9 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp
             value.value : value;
           if (isNotEmpty(nextValue)) {
             model.value = nextValue;
+            if (isNotEmpty(nextValue?.language)) {
+              model.language = nextValue.language;
+            }
           }
 
           this.initSecurityLevelConfig(model, modelRow);
@@ -258,6 +261,7 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp
     const model = this.getMandatoryFieldModel();
     const currentValue: string = (model.value instanceof FormFieldMetadataValueObject
       || model.value instanceof VocabularyEntry) ? model.value.value : model.value;
+    const currentLang: string = (model.value instanceof FormFieldMetadataValueObject) ? model.value.language : model.language;
     let security = null;
     if (this.model.value instanceof VocabularyEntry) {
       security = this.model.value.securityLevel;
@@ -266,7 +270,7 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp
         security = this.model.metadataValue.securityLevel;
       }
     }
-    const valueWithAuthority: any = new FormFieldMetadataValueObject(currentValue, null, security, authority);
+    const valueWithAuthority: any = new FormFieldMetadataValueObject(currentValue, currentLang, security, authority);
     model.value = valueWithAuthority;
     this.modifyChip();
     setTimeout(() => {
@@ -346,7 +350,8 @@ export class DsDynamicRelationGroupModalComponent extends DynamicFormControlComp
 
         item[control.name] =
           new FormFieldMetadataValueObject(
-            controlValue, (control as any)?.language,
+            controlValue,
+            mainModel?.language,
             controlValue === PLACEHOLDER_PARENT_METADATA ? null : mainModel.securityLevel,
             controlAuthority,
             null, 0, null,

src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-inline-group/dynamic-relation-inline-group.components.ts

@@ -216,6 +216,7 @@ export class DsDynamicRelationInlineGroupComponent extends DynamicFormControlCom
       }
 
       model.securityLevel = mainSecurityLevel;
+      model.language = (mainRow as any).language ?? null;
 
       modelGroup.group.forEach((item: any) => {
         if (item.name !== this.model.name) {
@@ -236,29 +237,30 @@ export class DsDynamicRelationInlineGroupComponent extends DynamicFormControlCom
 
   private getRowValue(formGroup: DynamicFormGroupModel, securityLevel?: number) {
     let mainSecurityLevel;
+    const mainRow = formGroup.group.find(itemModel => itemModel.name === this.model.name);
     if (isNotEmpty(securityLevel)) {
       mainSecurityLevel = securityLevel;
     } else {
-      const mainRow = formGroup.group.find(itemModel => itemModel.name === this.model.name);
       mainSecurityLevel = (mainRow as any).securityLevel;
     }
+    const mainLanguage = (mainRow as any).language ?? null;
     const groupValue = Object.create({});
     formGroup.group.forEach((model: any) => {
       if (model.name !== this.model.mandatoryField) {
         if (isEmpty(model.value)) {
           groupValue[model.name] = PLACEHOLDER_PARENT_METADATA;
         } else {
           if (typeof model.value === 'string') {
-            groupValue[model.name] = new FormFieldMetadataValueObject(model.value, null, mainSecurityLevel);
+            groupValue[model.name] = new FormFieldMetadataValueObject(model.value, mainLanguage, mainSecurityLevel);
           } else {
-            groupValue[model.name] = Object.assign(new FormFieldMetadataValueObject(), model.value, { securityLevel: mainSecurityLevel || null });
+            groupValue[model.name] = Object.assign(new FormFieldMetadataValueObject(), model.value, { language: mainLanguage, securityLevel: mainSecurityLevel || null });
           }
         }
       } else {
         if (typeof model.value === 'string') {
-          groupValue[model.name] = new FormFieldMetadataValueObject(model.value, null, mainSecurityLevel);
+          groupValue[model.name] = new FormFieldMetadataValueObject(model.value, mainLanguage, mainSecurityLevel);
         } else {
-          groupValue[model.name] = Object.assign(new FormFieldMetadataValueObject(), model.value, { securityLevel: mainSecurityLevel || null });
+          groupValue[model.name] = Object.assign(new FormFieldMetadataValueObject(), model.value, { language: mainLanguage, securityLevel: mainSecurityLevel || null });
         }
       }
     });