Merge remote-tracking branch 'bitbucket4science/dspace-cris-2024_02_x' into dspace-cris-2024_02_x

Author: atarix83

bitbucket-pipelines.yml

@@ -2,6 +2,9 @@ options:
   runs-on: self.hosted
 
 definitions:
+  caches:
+    node-cris8: ./node_modules
+
   steps:
     - step: &unittest-code-checks
         name: test-code-checks
@@ -10,7 +13,7 @@ definitions:
           run-as-user: 1000
         size: 4x
         caches:
-          - node
+          - node-cris8
         script:
           - yarn install --frozen-lockfile
           - yarn run lint --quiet

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/confirmation-modal/confirmation-modal.component.html

@@ -1,18 +1,18 @@
 <div>
-  <div class="modal-header">{{ headerLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+  <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
     <button type="button" class="close" (click)="close()" aria-label="Close">
       <span aria-hidden="true">×</span>
     </button>
   </div>
   <div class="modal-body">
-    <p>{{ infoLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}</p>
+    <p>{{ infoLabel | translate:{ dsoName: name } }}</p>
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-outline-secondary" (click)="cancelPressed()" aria-label="Cancel">
-      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: dsoNameService.getName(dso) } }}
+      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
     </button>
   </div>
 </div>

src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts

@@ -132,4 +132,32 @@ describe('ConfirmationModalComponent', () => {
     });
   });
 
+  describe('displaying the name in the modal', () => {
+    const testName = 'Test Name';
+    beforeEach(() => {
+      component.name = testName;
+      component.headerLabel = `Header: ${component.name}`;
+      component.infoLabel = `Info: ${component.name}`;
+      component.cancelLabel = `Cancel: ${component.name}`;
+      component.confirmLabel = `Confirm: ${component.name}`;
+      fixture.detectChanges();
+    });
+    it('should display the name in the header', () => {
+      const header = debugElement.query(By.css('.modal-header')).nativeElement.textContent;
+      expect(header).toContain(testName);
+    });
+    it('should display the name in the body', () => {
+      const body = debugElement.query(By.css('.modal-body')).nativeElement.textContent;
+      expect(body).toContain(testName);
+    });
+    it('should display the name in the cancel button', () => {
+      const cancelBtn = debugElement.query(By.css('button.cancel')).nativeElement.textContent;
+      expect(cancelBtn).toContain(testName);
+    });
+    it('should display the name in the confirm button', () => {
+      const confirmBtn = debugElement.query(By.css('button.confirm')).nativeElement.textContent;
+      expect(confirmBtn).toContain(testName);
+    });
+  });
+
 });

src/app/shared/confirmation-modal/confirmation-modal.component.ts

@@ -8,9 +8,6 @@ import {
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-
 @Component({
   selector: 'ds-confirmation-modal',
   templateUrl: 'confirmation-modal.component.html',
@@ -28,7 +25,7 @@ export class ConfirmationModalComponent {
    */
   @Input() brandColor = 'primary';
 
-  @Input() dso: DSpaceObject;
+  @Input() name: string;
 
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
@@ -38,7 +35,6 @@ export class ConfirmationModalComponent {
 
   constructor(
     protected activeModal: NgbActiveModal,
-    public dsoNameService: DSONameService,
   ) {
   }
 

src/app/shared/dso-selector/modal-wrappers/export-metadata-xls-selector/export-metadata-xls-selector.component.ts

@@ -24,6 +24,7 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import {
   COLLECTION_EXPORT_SCRIPT_NAME,
   ScriptDataService,
@@ -65,7 +66,8 @@ export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperC
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router,
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
-              private modalService: NgbModal) {
+              private modalService: NgbModal,
+              private dsoNameService: DSONameService) {
     super(activeModal, route);
   }
 
@@ -76,7 +78,7 @@ export class ExportMetadataXlsSelectorComponent extends DSOSelectorModalWrapperC
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata-xls.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata-xls.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata-xls.cancel';

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

@@ -22,6 +22,7 @@ import {
   filter,
   map,
   take,
+  tap,
 } from 'rxjs/operators';
 
 import { Metadata } from '../../../../../core/shared/metadata.utils';
@@ -76,6 +77,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 +198,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 +281,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 +303,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;
+    const returnValue = [];
+    if (value.indexOf('|||') === -1) {
+      returnValue.push(this.generateFormField(value));
+    } else if (value.indexOf('|||') !== -1 && this.otherInfoValue) {
+      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;
+        const 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,
+        ));
+      }
+    }
+    return returnValue;
+  }
+
+  private generateFormField(value: string): FormFieldMetadataValueObject {
     if (value.indexOf('::') === -1) {
-      returnValue = new FormFieldMetadataValueObject(value);
-    } else if (value.indexOf('|||') === -1) {
-      returnValue = new FormFieldMetadataValueObject(
+      return new FormFieldMetadataValueObject(value);
+    } else {
+      return new FormFieldMetadataValueObject(
         value.substring(0, value.lastIndexOf('::')),
         null,
         null,
         value.substring(value.lastIndexOf('::') + 2),
       );
-    } 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('::'));
-      }
-      returnValue = new FormFieldMetadataValueObject(
-        hasValue(alternativeValue) ? alternativeValue : this.otherInfoValue,
-        null,
-        null,
-        authorityValue,
-        null,
-        null,
-        null,
-        otherInfo,
-      );
     }
-    return returnValue;
   }
 
   private hasValidAuthority(formMetadataValue: FormFieldMetadataValueObject) {

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

@@ -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 as any).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 as any).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();
+      });
+
+    });
   });
 });
 

src/assets/i18n/en.json5

@@ -4050,6 +4050,8 @@
 
   "itemtemplate.edit.metadata.headers.value": "Value",
 
+  "itemtemplate.edit.metadata.headers.authority": "Authority",
+
   "itemtemplate.edit.metadata.metadatafield": "Edit field",
 
   "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",