Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-2176

atarix83 · atarix83 · commit 144f5740b0b0 · 2025-02-14T14:37:59.000Z
diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -36,13 +36,14 @@ export class JsonPatchOperationsBuilder {
    *    A boolean representing if the value to be added is the first of an array
    * @param plain
    *    A boolean representing if the value to be added is a plain text value
+   * @param languages
    */
-  add(path: JsonPatchOperationPathObject, value, first = false, plain = false) {
+  add(path: JsonPatchOperationPathObject, value, first = false, plain = false, languages: string[] = null) {
     this.store.dispatch(
       new NewPatchAddOperationAction(
         path.rootElement,
         path.subRootElement,
-        path.path, this.prepareValue(value, plain, first)));
+        path.path, this.prepareValue(value, plain, first, null, languages)));
   }
 
   /**
@@ -55,8 +56,9 @@ export class JsonPatchOperationsBuilder {
    * @param plain
    *    a boolean representing if the value to be added is a plain text value
    * @param securityLevel
+   * @param language
    */
-  replace(path: JsonPatchOperationPathObject, value, plain = false, securityLevel = null) {
+  replace(path: JsonPatchOperationPathObject, value, plain = false, securityLevel = null, language = null) {
     if (hasNoValue(value) || (typeof value === 'object' && hasNoValue(value.value))) {
       this.remove(path);
     } else {
@@ -65,7 +67,7 @@ export class JsonPatchOperationsBuilder {
           path.rootElement,
           path.subRootElement,
           path.path,
-          this.prepareValue(value, plain, false, securityLevel)));
+          this.prepareValue(value, plain, false, securityLevel, language)));
     }
   }
 
@@ -102,23 +104,23 @@ export class JsonPatchOperationsBuilder {
         path.path));
   }
 
-  protected prepareValue(value: any, plain: boolean, first: boolean, securityLevel = null) {
+  protected prepareValue(value: any, plain: boolean, first: boolean, securityLevel = null, languages: string[] = null) {
       let operationValue: any = null;
     if (hasValue(value)) {
       if (plain) {
         operationValue = value;
       } else {
         if (Array.isArray(value)) {
           operationValue = [];
-          value.forEach((entry) => {
+          value.forEach((entry, index) => {
             if ((typeof entry === 'object')) {
               if (isNotEmpty(securityLevel)) {
                 operationValue.push(this.prepareObjectValue(entry, securityLevel));
               } else {
                 operationValue.push(this.prepareObjectValue(entry));
               }
             } else {
-              operationValue.push(new FormFieldMetadataValueObject(entry, null, securityLevel));
+              operationValue.push(new FormFieldMetadataValueObject(entry, languages ? languages[index] : null, securityLevel));
             }
           });
         } else if (typeof value === 'object') {
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
@@ -181,7 +181,7 @@ export class FormBuilderService extends DynamicFormService {
     iterateControlModels(groupModel);
   }
 
-  getValueFromModel(groupModel: DynamicFormControlModel[]): void {
+  getValueFromModel(groupModel: DynamicFormControlModel[]): any {
     let result = Object.create({});
     const customizer = (objValue, srcValue) => {
       if (Array.isArray(objValue)) {
@@ -191,6 +191,7 @@ export class FormBuilderService extends DynamicFormService {
 
     const normalizeValue = (controlModel, controlValue, controlModelIndex) => {
       let securityLevel = null;
+      let controlLanguage = (controlModel as DsDynamicInputModel).hasLanguages ? (controlModel as DsDynamicInputModel).language : null;
       if (controlModel instanceof DynamicQualdropModel) {
         // get the security value inside in the metadataValue of input
         if (controlModel.group) {
@@ -215,6 +216,18 @@ export class FormBuilderService extends DynamicFormService {
             }
           });
         }
+
+        let qualdropLanguageControl = null;
+        for (const control of controlModel.group) {
+          if (hasValue((control as DsDynamicInputModel).language)) {
+            qualdropLanguageControl = control as DsDynamicInputModel;
+            break;
+          }
+        }
+        if (qualdropLanguageControl) {
+          controlModel.language = controlLanguage ?? qualdropLanguageControl.language;
+          controlLanguage = controlModel.language;
+        }
       }
       if (controlModel && (controlModel as any).securityLevel !== undefined) {
         securityLevel = (controlModel as any).securityLevel;
@@ -227,13 +240,13 @@ export class FormBuilderService extends DynamicFormService {
           }
         }
       }
-      const controlLanguage = (controlModel as DsDynamicInputModel).hasLanguages ? (controlModel as DsDynamicInputModel).language : null;
 
       if (controlModel?.metadataValue?.authority?.includes(VIRTUAL_METADATA_PREFIX)) {
         return controlModel.metadataValue;
       }
       if (isString(controlValue)) {
-        return new FormFieldMetadataValueObject(controlValue, controlLanguage, securityLevel, null, controlModelIndex);
+        const lang = controlModel instanceof DynamicQualdropModel ? controlModel.language : controlLanguage;
+        return new FormFieldMetadataValueObject(controlValue, lang, securityLevel, null, controlModelIndex);
       } else if (isNgbDateStruct(controlValue)) {
         return new FormFieldMetadataValueObject(dateToString(controlValue));
       } else if (isObject(controlValue)) {
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -73,7 +73,7 @@ export class OneboxFieldParser extends FieldParser {
       inputSelectGroup.readOnly = selectModelConfig.disabled && inputModelConfig.readOnly;
       // in case of qualdrop do not show toggle of security
       inputModelConfig.toggleSecurityVisibility = false;
-
+      inputSelectGroup.language = inputModelConfig.language;
       inputSelectGroup.group.push(new DynamicSelectModel(selectModelConfig, clsSelect));
       inputSelectGroup.group.push(new DsDynamicInputModel(inputModelConfig, clsInput));
 
diff --git a/src/app/statistics-page/cris-statistics-page/cris-statistics-page.component.spec.ts b/src/app/statistics-page/cris-statistics-page/cris-statistics-page.component.spec.ts
@@ -58,7 +58,12 @@ describe('CrisStatisticsPageComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
       imports : [
-        RouterTestingModule.withRoutes([]),
+        RouterTestingModule.withRoutes([
+          {
+            path: 'fake-url',
+            redirectTo: '/',
+          },
+        ]),
         SharedModule,
         TranslateModule.forRoot({
           loader: {
diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -740,7 +740,7 @@ describe('SectionFormOperationsService test suite', () => {
 
       serviceAsAny.dispatchOperationsFromMap(valueMap, pathCombiner, dynamicFormControlChangeEvent, previousValue);
 
-      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(pathCombiner.getPath('path'), ['testMapNew'], true);
+      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(pathCombiner.getPath('path'), ['testMapNew'], true, null, undefined);
     });
 
     it('should dispatch a json-path add operation when a map entry has changed', () => {
@@ -753,7 +753,7 @@ describe('SectionFormOperationsService test suite', () => {
 
       serviceAsAny.dispatchOperationsFromMap(valueMap, pathCombiner, dynamicFormControlChangeEvent, previousValue);
 
-      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(pathCombiner.getPath('path'), ['testMapNew'], true);
+      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(pathCombiner.getPath('path'), ['testMapNew'], true, false, undefined);
     });
 
     it('should dispatch a json-path remove operation when a map entry has changed', () => {
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -55,17 +55,19 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    * @param hasStoredValue
    *    representing if field value related to the specified operation has stored value
+   * @param languageMap
    */
   public dispatchOperationsFromEvent(pathCombiner: JsonPatchOperationPathCombiner,
                                      event: DynamicFormControlEvent,
                                      previousValue: FormFieldPreviousValueObject,
-                                     hasStoredValue: boolean): void {
+                                     hasStoredValue: boolean,
+                                     languageMap: Map<string, string[]> = null): void {
     switch (event.type) {
       case 'remove':
         this.dispatchOperationsFromRemoveEvent(pathCombiner, event, previousValue);
         break;
       case 'change':
-        this.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, hasStoredValue);
+        this.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, hasStoredValue, languageMap);
         break;
       case 'move':
         this.dispatchOperationsFromMoveEvent(pathCombiner, event, previousValue);
@@ -374,11 +376,13 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    * @param hasStoredValue
    *    representing if field value related to the specified operation has stored value
+   * @param languageMap
    */
   protected dispatchOperationsFromChangeEvent(pathCombiner: JsonPatchOperationPathCombiner,
                                               event: DynamicFormControlEvent,
                                               previousValue: FormFieldPreviousValueObject,
-                                              hasStoredValue: boolean): void {
+                                              hasStoredValue: boolean,
+                                              languageMap?: Map<string, string[]>): void {
     if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
       // Model is a DynamicRowArrayModel
       this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
@@ -396,7 +400,7 @@ export class SectionFormOperationsService {
     if (this.formBuilder.isQualdropGroup(event.model.parent as DynamicFormControlModel)
       || this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
       // It's a qualdrup model
-      this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
+      this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue, languageMap);
     } else if (this.formBuilder.isRelationGroup(event.model)) {
       // It's a relation model
       this.dispatchOperationsFromMap(this.getValueMap(value), pathCombiner, event, previousValue);
@@ -465,11 +469,13 @@ export class SectionFormOperationsService {
    *    the [[DynamicFormControlEvent]] for the specified operation
    * @param previousValue
    *    the [[FormFieldPreviousValueObject]] for the specified operation
+   * @param languageMap
    */
   protected dispatchOperationsFromMap(valueMap: Map<string, any>,
                                       pathCombiner: JsonPatchOperationPathCombiner,
                                       event: DynamicFormControlEvent,
-                                      previousValue: FormFieldPreviousValueObject): void {
+                                      previousValue: FormFieldPreviousValueObject,
+                                      languageMap: Map<string, string[]> = null): void {
     const currentValueMap = valueMap;
     if (event.type === 'remove') {
       const path = this.getQualdropItemPathFromEvent(event);
@@ -480,7 +486,8 @@ export class SectionFormOperationsService {
           const currentValue = currentValueMap.get(index);
           if (currentValue) {
             if (!isEqual(entry, currentValue)) {
-              this.operationsBuilder.add(pathCombiner.getPath(index), currentValue, true);
+              const metadataFromPath = pathCombiner.getPath(index).path.split('/').slice(-1)[0];
+              this.operationsBuilder.add(pathCombiner.getPath(index), currentValue, true, false, languageMap?.get(metadataFromPath));
             }
             currentValueMap.delete(index);
           } else if (!currentValue) {
@@ -493,7 +500,8 @@ export class SectionFormOperationsService {
           // The last item of the group has been deleted so make a remove op
           this.operationsBuilder.remove(pathCombiner.getPath(index));
         } else {
-          this.operationsBuilder.add(pathCombiner.getPath(index), entry, true);
+          const metadataFromPath = pathCombiner.getPath(index).path.split('/').slice(-1)[0];
+          this.operationsBuilder.add(pathCombiner.getPath(index), entry, true, null, languageMap?.get(metadataFromPath));
         }
       });
     }
@@ -576,4 +584,5 @@ export class SectionFormOperationsService {
       }
     }
   }
+
 }
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
@@ -40,6 +40,7 @@ import { FormRowModel } from '../../../core/config/models/config-submission-form
 import { SubmissionVisibility } from '../../utils/visibility.util';
 import { MetadataSecurityConfiguration } from '../../../core/submission/models/metadata-security-configuration';
 import { SubmissionVisibilityType } from '../../../core/config/models/config-submission-section.model';
+import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 
 /**
  * This component represents a section that contains a Form.
@@ -409,11 +410,45 @@ export class SubmissionSectionFormComponent extends SectionModelComponent implem
    *    the [[DynamicFormControlEvent]] emitted
    */
   onChange(event: DynamicFormControlEvent): void {
-    this.formOperationsService.dispatchOperationsFromEvent(
-      this.pathCombiner,
-      event,
-      this.previousValue,
-      this.hasStoredValue(this.formBuilderService.getId(event.model), this.formOperationsService.getArrayIndexFromEvent(event)));
+    const languageMap = new Map();
+    const isQualdrop = event.model.parent instanceof DynamicQualdropModel;
+
+    if (isQualdrop) {
+      const qualdropMap = this.formOperationsService.getQualdropValueMap(event);
+
+      if (qualdropMap) {
+        const groupMetadata = qualdropMap.keys();
+        this.formService.getForm(this.formId).pipe(take(1)).subscribe((form) => {
+          for (const metadata of groupMetadata) {
+            if (hasValue(form.data[metadata]) && form.data[metadata].length > 1) {
+              form.data[metadata].forEach((entry: any) => {
+                languageMap.set(metadata, [...(languageMap.get(metadata) ?? []), entry.language]);
+              });
+            } else {
+              languageMap.set(metadata, [form.data[metadata][0].language]);
+            }
+          }
+        });
+      }
+
+      this.formOperationsService.dispatchOperationsFromEvent(
+        this.pathCombiner,
+        event,
+        this.previousValue,
+        this.hasStoredValue(this.formBuilderService.getId(event.model), this.formOperationsService.getArrayIndexFromEvent(event)),
+        languageMap
+      );
+    } else {
+      this.formOperationsService.dispatchOperationsFromEvent(
+        this.pathCombiner,
+        event,
+        this.previousValue,
+        this.hasStoredValue(this.formBuilderService.getId(event.model), this.formOperationsService.getArrayIndexFromEvent(event)),
+        null
+      );
+    }
+
+
     const metadata = this.formOperationsService.getFieldPathSegmentedFromChangeEvent(event);
     const value = this.formOperationsService.getFieldValueFromChangeEvent(event);
 
