Merged in task/dspace-cris-2023_02_x/DSC-2285 (pull request DSpace#3077)

[DSC-2285] fix authority values not working correctly in dynamic-onebox

Approved-by: Giuseppe Digilio

Author: Andrea Barbasso

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

@@ -175,12 +175,12 @@ describe('DsDynamicOneboxComponent test suite', () => {
       providers: [
         ChangeDetectorRef,
         DsDynamicOneboxComponent,
-        { provide: VocabularyService, useValue: vocabularyServiceStub },
-        { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
-        { provide: NgbModal, useValue: modal },
-        { provide: FormBuilderService },
-        { provide: SubmissionService, useClass: SubmissionServiceStub }
+        {provide: VocabularyService, useValue: vocabularyServiceStub},
+        {provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService},
+        {provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService},
+        {provide: NgbModal, useValue: modal},
+        {provide: FormBuilderService},
+        {provide: SubmissionService, useClass: SubmissionServiceStub}
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -348,7 +348,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
-        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null,null, 'testDisplay');
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null, null, 'testDisplay');
         oneboxCompFixture.detectChanges();
       });
 
@@ -359,7 +359,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
       it('should init component properly', fakeAsync(() => {
         tick();
-        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null,null, 'testDisplay'));
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null, null, 'testDisplay'));
         expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByValue).not.toHaveBeenCalled();
       }));
 
@@ -396,7 +396,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
       it('should init component properly', fakeAsync(() => {
         tick();
-        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null,validAuthority, 'test'));
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null, validAuthority, 'test'));
         expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByID).not.toHaveBeenCalled();
       }));
 
@@ -457,7 +457,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
-        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null,  null, 'testDisplay');
+        (oneboxComponent.model as any).value = new FormFieldMetadataValueObject('test', null, null, null, 'testDisplay');
         oneboxCompFixture.detectChanges();
       });
 
@@ -468,7 +468,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
 
       it('should init component properly', fakeAsync(() => {
         tick();
-        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null,null, 'testDisplay'));
+        expect(oneboxComponent.currentValue).toEqual(new FormFieldMetadataValueObject('test', null, null, null, 'testDisplay'));
         expect((oneboxComponent as any).vocabularyService.getVocabularyEntryByValue).toHaveBeenCalled();
       }));
 
@@ -517,6 +517,38 @@ describe('DsDynamicOneboxComponent test suite', () => {
       }));
     });
 
+  describe('selectAlternativeInformation', () => {
+    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('sets authority when unformattedOtherInfoValue contains "::"', () => {
+      const info = 'testInfo';
+      const unformattedItem = 'testInfo::authorityValue';
+      oneboxComponent.otherInfoValuesUnformatted = [unformattedItem];
+
+      oneboxComponent.selectAlternativeInfo(info);
+
+      expect(oneboxComponent.currentValue.authority).toBe('authorityValue');
+    });
+
+    it('sets authority to undefined when unformattedOtherInfoValue does not contain "::"', () => {
+      const info = 'testInfo';
+      const unformattedItem = 'testInfo';
+      oneboxComponent.otherInfoValuesUnformatted = [unformattedItem];
+
+      oneboxComponent.selectAlternativeInfo(info);
+
+      expect(oneboxComponent.currentValue.authority).toBeUndefined();
+    });
+  });
   });
 });
 

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

@@ -1,12 +1,4 @@
-import {
-  ChangeDetectorRef,
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild
-} from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import { UntypedFormGroup } from '@angular/forms';
 
 import {
@@ -373,6 +365,19 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
     this.currentValue = null;
     this.currentValue = temp;
 
+    const unformattedOtherInfoValue = this.otherInfoValuesUnformatted.find((unformattedItem) => {
+      return unformattedItem.startsWith(info);
+    });
+
+    if (hasValue(unformattedOtherInfoValue)) {
+      const lastIndexOfSeparator = unformattedOtherInfoValue.lastIndexOf('::');
+      if (lastIndexOfSeparator !== -1) {
+        this.currentValue.authority = unformattedOtherInfoValue.substring(lastIndexOfSeparator + 2);
+      } else {
+        this.currentValue.authority = undefined;
+      }
+    }
+
     const event = {
       item: this.currentValue
     } as any;
@@ -388,7 +393,14 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
 
     this.otherInfoKey = hasAlternativeNames ? this.alternativeNamesKey : keys.find(key => hasValue(item.otherInformation[key]) && item.otherInformation[key].includes('|||'));
     this.otherInfoValuesUnformatted = item.otherInformation[this.otherInfoKey] ? item.otherInformation[this.otherInfoKey].split('|||') : [];
-    this.otherInfoValues = this.otherInfoValuesUnformatted.map(unformattedItem => unformattedItem.substring(0, unformattedItem.lastIndexOf('::')));
+
+    this.otherInfoValues = this.otherInfoValuesUnformatted.map(unformattedItem => {
+      let lastIndexOfSeparator = unformattedItem.lastIndexOf('::');
+      if (lastIndexOfSeparator === -1) {
+        lastIndexOfSeparator = undefined;
+      }
+      return unformattedItem.substring(0, lastIndexOfSeparator);
+    });
 
     if (hasAlternativeNames) {
       this.otherName = hasValue(this.otherName) ? this.otherName : this.otherInfoValues[0];