Merge branch 'task/dspace-cris-2023_02_x/DSC-2397' into task/dspace-cris-2024_02_x/DSC-2397

# Conflicts:
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
#	src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts

Author: atarix83

src/app/core/submission/vocabularies/models/vocabulary.model.ts

@@ -74,6 +74,14 @@ export class Vocabulary implements CacheableObject {
   @autoserialize
     externalSource: VocabularyExternalSourceMap;
 
+
+  /**
+   * A boolean variable that indicates whether the functionality of
+   * multiple value generation is enabled within a generator context.
+   */
+  @autoserialize
+  multiValueOnGenerator: boolean;
+
   /**
    * A string representing the kind of Vocabulary model
    */

src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts

@@ -21,7 +21,7 @@ import {
   distinctUntilChanged,
   filter,
   map,
-  take,
+  take, tap,
 } from 'rxjs/operators';
 
 import { Metadata } from '../../../../../core/shared/metadata.utils';
@@ -76,6 +76,8 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
   public otherInfoValues: string[] = [];
   public otherInfoValuesUnformatted: string[] = [];
 
+  multiValueOnGenerator: boolean;
+
   protected constructor(protected vocabularyService: VocabularyService,
                         protected layoutService: DynamicFormLayoutService,
                         protected validationService: DynamicFormValidationService,
@@ -195,6 +197,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
     this.vocabulary$ = this.vocabularyService.findVocabularyById(this.model.vocabularyOptions.name).pipe(
       getFirstSucceededRemoteDataPayload(),
       distinctUntilChanged(),
+      tap((vocabulary: Vocabulary) => this.multiValueOnGenerator = vocabulary.multiValueOnGenerator),
     );
   }
 
@@ -277,12 +280,14 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
         for (const key in otherInformation) {
           if (otherInformation.hasOwnProperty(key) && key.startsWith('data-')) {
             const fieldId = key.replace('data-', '');
-            const newValue: FormFieldMetadataValueObject = this.getOtherInformationValue(otherInformation[key], key);
-            if (isNotEmpty(newValue)) {
-              const updatedModel = this.formBuilderService.updateModelValue(fieldId, newValue);
-              if (isNotEmpty(updatedModel)) {
-                updatedModels.push(updatedModel);
-              }
+            const newValues: FormFieldMetadataValueObject[] = this.getOtherInformationValue(otherInformation[key], key);
+            if (isNotEmpty(newValues)) {
+              newValues.forEach((newValue) => {
+                const updatedModel = this.formBuilderService.updateModelValue(fieldId, newValue);
+                if (isNotEmpty(updatedModel)) {
+                  updatedModels.push(updatedModel);
+                }
+              });
             }
           }
         }
@@ -297,43 +302,53 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
     }
   }
 
-  getOtherInformationValue(value: string, key: string): FormFieldMetadataValueObject {
+  getOtherInformationValue(value: string, key: string): FormFieldMetadataValueObject[] {
     if (isEmpty(value) || key === 'alternative-names' ) {
       return null;
     }
 
-    let returnValue;
-    if (value.indexOf('::') === -1) {
-      returnValue = new FormFieldMetadataValueObject(value);
-    } else if (value.indexOf('|||') === -1) {
-      returnValue = new FormFieldMetadataValueObject(
-        value.substring(0, value.lastIndexOf('::')),
-        null,
-        null,
-        value.substring(value.lastIndexOf('::') + 2),
-      );
+    let returnValue = [];
+    if (value.indexOf('|||') === -1) {
+      returnValue.push(this.generateFormField(value));
     } else if (value.indexOf('|||') !== -1 && this.otherInfoValue) {
-      const unformattedValue =  this.otherInfoValuesUnformatted.find(otherInfoValue => otherInfoValue.includes(this.otherInfoValue || this.otherName));
-      const authorityValue = hasValue(unformattedValue) ?  unformattedValue.substring(unformattedValue.lastIndexOf('::') + 2) : null;
-      const otherInfo = {};
-      let alternativeValue;
-      otherInfo[key] = value;
-      if (hasValue(this.otherName)) {
-        const otherValues = value.split('|||');
-        alternativeValue = otherValues[0].substring(0, otherValues[0].lastIndexOf('::'));
+      const otherValues: string[] = value.split('|||');
+      if (this.multiValueOnGenerator) {
+        otherValues.forEach((tmpValue) => returnValue.push(this.generateFormField(tmpValue)));
+      } else {
+        const unformattedValue = this.otherInfoValuesUnformatted.find(otherInfoValue => otherInfoValue.includes(this.otherInfoValue || this.otherName));
+        const authorityValue = hasValue(unformattedValue) ? unformattedValue.substring(unformattedValue.lastIndexOf('::') + 2) : null;
+        let otherInfo = {};
+        let alternativeValue: string;
+        otherInfo[key] = value;
+        if (hasValue(this.otherName)) {
+          alternativeValue = otherValues[0].substring(0, otherValues[0].lastIndexOf('::'));
+        }
+        returnValue.push(new FormFieldMetadataValueObject(
+          hasValue(alternativeValue) ? alternativeValue : this.otherInfoValue,
+          null,
+          null,
+          authorityValue,
+          null,
+          null,
+          null,
+          otherInfo
+        ));
       }
-      returnValue = new FormFieldMetadataValueObject(
-        hasValue(alternativeValue) ? alternativeValue : this.otherInfoValue,
-        null,
-        null,
-        authorityValue,
-        null,
+    }
+    return returnValue;
+  }
+
+  private generateFormField(value: string): FormFieldMetadataValueObject {
+    if (value.indexOf('::') === -1) {
+      return new FormFieldMetadataValueObject(value);
+    } else {
+      return new FormFieldMetadataValueObject(
+        value.substring(0, value.lastIndexOf('::')),
         null,
         null,
-        otherInfo,
+        value.substring(value.lastIndexOf('::') + 2)
       );
     }
-    return returnValue;
   }
 
   private hasValidAuthority(formMetadataValue: FormFieldMetadataValueObject) {

src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts

@@ -104,7 +104,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
   let scheduler: TestScheduler;
   let testComp: TestComponent;
-  let oneboxComponent: DsDynamicOneboxComponent;
+  let oneboxComponent: DsDynamicOneboxComponent|any;
   let testFixture: ComponentFixture<TestComponent>;
   let debugElement: DebugElement;
   let oneboxCompFixture: ComponentFixture<DsDynamicOneboxComponent>;
@@ -570,6 +570,66 @@ describe('DsDynamicOneboxComponent test suite', () => {
         expect(oneboxComponent.currentValue.authority).toBeUndefined();
       });
     });
+
+  describe('test metadata enrichment', () => {
+    beforeEach(() => {
+      oneboxCompFixture = TestBed.createComponent(DsDynamicOneboxComponent);
+      debugElement = oneboxCompFixture.debugElement;
+      oneboxComponent = oneboxCompFixture.componentInstance;
+      oneboxComponent.currentValue = new FormFieldMetadataValueObject('test', null, null, null, 'testDisplay');
+      oneboxComponent.model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
+
+      spyOn(oneboxComponent, 'onSelectItem').and.returnValue(undefined);
+      spyOn(oneboxComponent, 'toggleOtherInfoSelection').and.returnValue(undefined);
+    });
+
+
+    it('should return null if value is empty', () => {
+      expect(oneboxComponent.getOtherInformationValue('', 'some-key')).toBeNull();
+    });
+
+    it('should return null if key is "alternative-names"', () => {
+      expect(oneboxComponent.getOtherInformationValue('some-value', 'alternative-names')).toBeNull();
+    });
+
+    it('should return single FormFieldMetadataValueObject if no "|||" in value', () => {
+      const result = oneboxComponent.getOtherInformationValue('value::authority', 'some-key');
+      expect(result.length).toBe(1);
+      expect(result[0]).toEqual(jasmine.any(FormFieldMetadataValueObject));
+      expect(result[0].value).toBe('value');
+      expect(result[0].authority).toBe('authority');
+    });
+
+    it('should handle multiple values with multiValueOnGenerator true', () => {
+      oneboxComponent.multiValueOnGenerator = true;
+      oneboxComponent.otherInfoValue = 'someValue';
+      const result = oneboxComponent.getOtherInformationValue('val1::auth1|||val2::auth2', 'some-key');
+      expect(result.length).toBe(2);
+      expect(result[0].value).toBe('val1');
+      expect(result[0].authority).toBe('auth1');
+      expect(result[1].value).toBe('val2');
+      expect(result[1].authority).toBe('auth2');
+    });
+
+    it('should handle multiple values with multiValueOnGenerator false', () => {
+      oneboxComponent.multiValueOnGenerator = false;
+      oneboxComponent.otherInfoValue = 'val1';
+      oneboxComponent.otherInfoValuesUnformatted = ['val1::auth1'];
+      const result = oneboxComponent.getOtherInformationValue('val1::auth1|||val2::auth2', 'data-key');
+      expect(result.length).toBe(1);
+      expect(result[0].value).toBe('val1');
+      expect(result[0].authority).toBe('auth1');
+      expect(result[0].otherInformation['data-key']).toBe('val1::auth1|||val2::auth2');
+    });
+
+    it('should handle value without "::"', () => {
+      const result = oneboxComponent.getOtherInformationValue('simpleValue', 'some-key');
+      expect(result.length).toBe(1);
+      expect(result[0].value).toBe('simpleValue');
+      expect(result[0].authority).toBeNull();
+    });
+
+  });
   });
 });