Merge branch 'dspace-cris-2023_02_x' into ux-plus-2023_02_x

atarix83 · atarix83 · commit fb2154feee0a · 2025-04-10T21:05:41.000+02:00
# Conflicts:
#	package.json
#	yarn.lock
diff --git a/package.json b/package.json
@@ -100,7 +100,6 @@
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "@swimlane/ngx-charts": "^20.4.1",
     "@types/googlemaps": "^3.43.3",
-    "@types/grecaptcha": "^3.0.4",
     "@types/leaflet": "^1.9.12",
     "angular-idle-preload": "3.0.0",
     "angulartics2": "^12.2.1",
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -1,7 +1,7 @@
 import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { UntypedFormControl, UntypedFormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
 import { BrowserModule, By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
@@ -30,7 +30,7 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
 import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
 import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
@@ -46,7 +46,7 @@ describe('EPersonFormComponent', () => {
   let ePersonDataServiceStub: any;
   let authService: AuthServiceStub;
   let authorizationService: AuthorizationDataService;
-  let groupsDataService: GroupDataService;
+  let groupsDataService: jasmine.SpyObj<GroupDataService>;
   let epersonRegistrationService: EpersonRegistrationService;
   let route: ActivatedRouteStub;
   let router: RouterStub;
@@ -513,4 +513,15 @@ describe('EPersonFormComponent', () => {
       expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'forgot');
     });
   });
+
+  describe('findListByHref functionality', () => {
+    it('retrieves groups and object on page change', fakeAsync(() => {
+      component.activeEPerson$ = observableOf({_links: { groups: { href: 'groups' } } } as EPerson);
+
+      const options = { currentPage: 1, elementsPerPage: 5 };
+      component.onPageChange(options.currentPage);
+      tick();
+      expect(groupsDataService.findListByHref).toHaveBeenCalledWith(jasmine.anything(), options, undefined, undefined, followLink('object'));
+    }));
+  });
 });
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -576,7 +576,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   private updateGroups(options) {
     this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {
-      this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
+      this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options, undefined, undefined, followLink('object'));
     }));
   }
 }
diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts
@@ -96,6 +96,10 @@ export interface MetadataValueFilter {
 
   /** Whether the value constraint should match as a substring. */
   substring?: boolean;
+  /**
+   * Whether to negate the filter
+   */
+  negate?: boolean;
 }
 
 export class MetadatumViewModel {
diff --git a/src/app/core/shared/metadata.utils.spec.ts b/src/app/core/shared/metadata.utils.spec.ts
@@ -1,7 +1,7 @@
 import { isUndefined } from '../../shared/empty.util';
 import { v4 as uuidv4 } from 'uuid';
 import { MetadataMap, MetadataValue, MetadataValueFilter, MetadatumViewModel } from './metadata.models';
-import { Metadata, PLACEHOLDER_VALUE } from './metadata.utils';
+import { Metadata } from './metadata.utils';
 
 const mdValue = (value: string, language?: string, authority?: string): MetadataValue => {
   return Object.assign(new MetadataValue(), {
@@ -306,21 +306,4 @@ describe('Metadata', () => {
       testAllWithLimit(multiMap, 'dc.title', [dcTitle1], 1);
     });
   });
-
-  describe('Placeholder values', () => {
-    it('should ignore placeholder values in get methods', () => {
-      const placeholderMd = mdValue(PLACEHOLDER_VALUE);
-      const key = 'dc.test.placeholder';
-      const map = { 'dc.test.placeholder': [placeholderMd] };
-
-      expect(Metadata.all(map, key).length).toEqual(0);
-      expect(Metadata.allValues(map, key).length).toEqual(0);
-      expect(Metadata.has(map, key)).toBeFalsy();
-      expect(Metadata.first(map, key)).toBeUndefined();
-      expect(Metadata.firstValue(map, key)).toBeUndefined();
-      expect(Metadata.hasValue(placeholderMd)).toBeFalsy();
-      expect(Metadata.valueMatches(placeholderMd, null)).toBeFalsy();
-    });
-  });
-
 });
diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
@@ -15,8 +15,6 @@ import { validate as uuidValidate } from 'uuid';
 export const AUTHORITY_GENERATE = 'will be generated::';
 export const AUTHORITY_REFERENCE = 'will be referenced::';
 export const PLACEHOLDER_VALUE = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
-
-
 /**
  * Utility class for working with DSpace object metadata.
  *
@@ -31,6 +29,7 @@ export const PLACEHOLDER_VALUE = '#PLACEHOLDER_PARENT_METADATA_VALUE#';
  * followed by any other (non-dc) metadata values.
  */
 export class Metadata {
+
   /**
    * Gets all matching metadata in the map(s).
    *
@@ -153,11 +152,11 @@ export class Metadata {
    * Returns true if this Metadatum's value is defined
    */
   public static hasValue(value: MetadataValue|string): boolean {
-    if (isEmpty(value) || value === PLACEHOLDER_VALUE) {
+    if (isEmpty(value)) {
       return false;
     }
     if (isObject(value) && value.hasOwnProperty('value')) {
-      return isNotEmpty(value.value) && value.value !== PLACEHOLDER_VALUE;
+      return isNotEmpty(value.value);
     }
     return true;
   }
@@ -170,9 +169,7 @@ export class Metadata {
    * @returns {boolean} whether the filter matches, or true if no filter is given.
    */
   public static valueMatches(mdValue: MetadataValue, filter: MetadataValueFilter) {
-    if (mdValue.value === PLACEHOLDER_VALUE) {
-      return false;
-    } else if (!filter) {
+    if (!filter) {
       return true;
     } else if (filter.language && filter.language !== mdValue.language) {
       return false;
@@ -181,15 +178,19 @@ export class Metadata {
     } else if (filter.value) {
       let fValue = filter.value;
       let mValue = mdValue.value;
+
       if (filter.ignoreCase) {
         fValue = filter.value.toLowerCase();
         mValue = mdValue.value.toLowerCase();
       }
+      let result;
+
       if (filter.substring) {
-        return mValue.includes(fValue);
+        result = mValue.includes(fValue);
       } else {
-        return mValue === fValue;
+        result = mValue === fValue;
       }
+      return filter.negate ? !result : result;
     }
     return true;
   }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -424,6 +424,8 @@ export class DsoEditMetadataForm {
                   value: value.newValue.value,
                   language: value.newValue.language,
                   authority: value.newValue.authority,
+                  confidence: value.newValue.confidence,
+                  securityLevel: value.originalValue.securityLevel,
                 }));
               }
               // "replace" the security level value
@@ -433,6 +435,7 @@ export class DsoEditMetadataForm {
                   value: value.newValue.value,
                   language: value.newValue.language,
                   authority: value.newValue.authority,
+                  confidence: value.newValue.confidence,
                 }));
               }
             } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts b/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();
+    });
+  });
   });
 });
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/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];
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -38,15 +38,15 @@
                 <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date"
                       [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
               </ng-container>
-              <span *ngIf="dso.allMetadataValues(authorMetadata).length > 0" class="item-list-authors">
+              <span *ngIf="dso.allMetadataValues(authorMetadata, placeholderFilter).length > 0" class="item-list-authors">
                 <ng-container *ngVar="(isCollapsed() | async) as isCollapsed">
                   <ng-container *ngIf="isCollapsed">
-                    <span *ngFor="let author of dso.limitedMetadata(authorMetadata, additionalMetadataLimit); let i=index; let last=last;">
+                    <span *ngFor="let author of dso.limitedMetadata(authorMetadata, additionalMetadataLimit, placeholderFilter); let i=index; let last=last;">
                       <ds-metadata-link-view [item]="dso" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view><span *ngIf="!last">; </span>
                     </span>
                   </ng-container>
                   <ng-container *ngIf="!isCollapsed">
-                     <span *ngFor="let author of dso.allMetadata(authorMetadata); let i=index; let last=last;">
+                     <span *ngFor="let author of dso.allMetadata(authorMetadata, placeholderFilter); let i=index; let last=last;">
                       <ds-metadata-link-view [item]="dso" [metadata]="author" [metadataName]="authorMetadata"></ds-metadata-link-view><span *ngIf="!last">; </span>
                     </span>
                   </ng-container>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -18,6 +18,8 @@ import { getFirstSucceededRemoteListPayload } from '../../../../../../core/share
 import { differenceInDays, differenceInMilliseconds, parseISO} from 'date-fns';
 import { filter, map } from 'rxjs/operators';
 import { isNotEmpty } from '../../../../../empty.util';
+import { MetadataValueFilter } from '../../../../../../core/shared/metadata.models';
+import { PLACEHOLDER_VALUE } from '../../../../../../core/shared/metadata.utils';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
@@ -54,6 +56,11 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
 
   hasLoadedThirdPartyMetrics$: Observable<boolean>;
 
+  readonly placeholderFilter: MetadataValueFilter = {
+    negate: true,
+    value: PLACEHOLDER_VALUE
+  };
+
   private thirdPartyMetrics = environment.info.metricsConsents.filter(metric => metric.enabled).map(metric => metric.key);
 
   constructor(
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,14 +1,14 @@
 <div [class.d-none]="!availableFilters">
   <h3>{{"search.filters.head" | translate}}</h3>
   <div *ngIf="(filters | async)?.hasSucceeded">
-    <div #searchFilter [class.visually-hidden]="filtersWithComputedVisibility !== (filters | async)?.payload?.length"
+    <div #searchFilter [class.visually-hidden]="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length"
          *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
       <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
   </div>
 
 
-  <ng-container *ngIf="filtersWithComputedVisibility !== (filters | async)?.payload?.length">
+  <ng-container *ngIf="getFinalFiltersComputed(this.currentConfiguration) !== (filters | async)?.payload?.length">
     <ngx-skeleton-loader [count]="defaultFilterCount"/>
   </ng-container>
   <a class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" queryParamsHandling="merge" role="button"><i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}</a>
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts

Original file line number	Diff line number	Diff line change
`@@ -576,7 +576,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {`
`576`	`576`	`*/`
`577`	`577`	`private updateGroups(options) {`
`578`	`578`	`this.subs.push(this.activeEPerson$.subscribe((eperson: EPerson) => {`
`579`		`- this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);`
	`579`	`+ this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options, undefined, undefined, followLink('object'));`
`580`	`580`	`}));`
`581`	`581`	`}`
`582`	`582`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,10 @@ export interface MetadataValueFilter {`
`96`	`96`
`97`	`97`	`/** Whether the value constraint should match as a substring. */`
`98`	`98`	`substring?: boolean;`
	`99`	`+ /**`
	`100`	`+ * Whether to negate the filter`
	`101`	`+ */`
	`102`	`+ negate?: boolean;`
`99`	`103`	`}`
`100`	`104`
`101`	`105`	`export class MetadatumViewModel {`