Merged dspace-cris-7 into DSC-867

Author: atarix83

src/app/core/data/item-data.service.spec.ts

@@ -20,6 +20,8 @@ import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-serv
 import { testCreateDataImplementation } from './base/create-data.spec';
 import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { RestRequestMethod } from './rest-request-method';
+import objectContaining = jasmine.objectContaining;
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -146,11 +148,14 @@ describe('ItemDataService', () => {
 
     beforeEach(() => {
       service = initTestService();
-      result = service.mapToCollection('item-id', 'collection-href');
+      result = service.mapToCollection('item-id', 'collection-href?query=param');
     });
 
-    it('should send a POST request', () => {
-      result.subscribe(() => expect(requestService.send).toHaveBeenCalledWith(jasmine.any(PostRequest)));
+    it('should send a POST request with stripped query params in collectionHref', () => {
+      result.subscribe(() => expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+        method: RestRequestMethod.POST,
+        body: 'collection-href'
+      })));
     });
   });
 

src/app/core/data/item-data.service.ts

@@ -145,7 +145,8 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
         let headers = new HttpHeaders();
         headers = headers.append('Content-Type', 'text/uri-list');
         options.headers = headers;
-        return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionHref, options);
+        const collectionURI = collectionHref.split('?')[0];
+        return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionURI, options);
       }),
       sendRequest(this.requestService),
       switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid))

src/app/core/data/processes/process-data.service.ts

@@ -19,12 +19,12 @@ import { dataService } from '../base/data-service.decorator';
 import { DeleteData, DeleteDataImpl } from '../base/delete-data';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NoContent } from '../../shared/NoContent.model';
-import { SearchData } from '../base/search-data';
+import { SearchData, SearchDataImpl } from '../base/search-data';
 
 @Injectable()
 @dataService(PROCESS)
 export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process> {
-  protected findOwnLink = 'own';
+  protected findOwnLink = 'search/own';
 
   private findAllData: FindAllData<Process>;
   private deleteData: DeleteData<Process>;
@@ -42,6 +42,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive, this.constructIdEndpoint);
   }
 
   /**
@@ -139,7 +140,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    *    Return an observable that emits object list
    */
   searchItsOwnProcesses(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
-    return this.searchData.searchBy(this.findOwnLink, options);
+    return this.searchData.searchBy(this.findOwnLink, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
   /**

src/app/core/submission/models/edititem-mode.model.ts

@@ -41,17 +41,6 @@ export class EditItemMode extends CacheableObject {
   @autoserialize
   label: string;
 
-  /**
-   * Security level of this EditItem Mode
-   * Allowed value are:
-   *  1 = Admin
-   *  2 = Owner
-   *  3 = Admin+Owner
-   *  4 = Custom
-   */
-  @autoserialize
-  security: number;
-
   /**
    * Name of the Submission Definition used
    * for this EditItem mode

src/app/core/submission/vocabularies/vocabulary.service.ts

@@ -1,17 +1,14 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { first, map, mergeMap, switchMap } from 'rxjs/operators';
-import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
+import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RequestService } from '../../data/request.service';
 import { RemoteData } from '../../data/remote-data';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { Vocabulary } from './models/vocabulary.model';
 import { VocabularyEntry } from './models/vocabulary-entry.model';
 import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
-} from '../../shared/operators';
+import { getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteListPayload } from '../../shared/operators';
 import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
 import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
 import { RequestParam } from '../../cache/models/request-param.model';
@@ -153,8 +150,27 @@ export class VocabularyService {
    */
   getPublicVocabularyEntryByValue(vocabularyName: string, value: string): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
     const params: RequestParam[] = [
-      new RequestParam('filter',value),
-      new RequestParam('exact','true')
+      new RequestParam('filter', value),
+      new RequestParam('exact', 'true')
+    ];
+    const options = Object.assign(new FindListOptions(), {
+      searchParams: params,
+      elementsPerPage: 1,
+    });
+    const href$ = this.vocabularyDataService.getFindAllHref(options, vocabularyName + '/entries');
+    return this.vocabularyEntryDetailDataService.findListByHref(href$);
+  }
+
+  /**
+   * Get the display value for a hierarchical vocabulary item,
+   * given the vocabulary name and the entryID of that vocabulary-entry
+   *
+   * @param vocabularyName
+   * @param entryID
+   */
+  getPublicVocabularyEntryByID(vocabularyName: string, entryID: string): Observable<RemoteData<PaginatedList<VocabularyEntryDetail>>> {
+    const params: RequestParam[] = [
+      new RequestParam('entryID', entryID)
     ];
     const options = Object.assign(new FindListOptions(), {
       searchParams: params,

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.html

@@ -19,7 +19,7 @@
 
             <ng-container *ngIf="attachmentConf.type == AdvancedAttachmentElementType.Metadata">
 
-              <p class="word-break m-0" *ngIf="!attachmentConf.truncatable">
+              <p class="text-break m-0" data-test="attachment-name" *ngIf="!attachmentConf.truncatable">
                 {{attachment.firstMetadataValue(attachmentConf.name)}}
               </p>
 

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.spec.ts

@@ -208,6 +208,11 @@ describe('AdvancedAttachmentComponent', () => {
         expect(entries[0].query(By.css('[data-test="checksum"]'))).toBeTruthy();
       });
 
+      it('should wrap the title', () => {
+        const titleElement = de.query(By.css('[data-test="attachment-name"]')).nativeElement;
+        expect(titleElement.classList).toContain('text-break');
+      });
+
       describe('and the field has metadata key and value set as value', () => {
         beforeEach(() => {
           // NOTE: Cannot override providers once components have been compiled, so TestBed needs to be reset

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/bitstream-attachment-rendering.model.ts

@@ -34,7 +34,8 @@ export abstract class BitstreamAttachmentRenderingModelComponent extends Bitstre
 
   getBitstreamsByItem(options?: FindListOptions): Observable<PaginatedList<Bitstream>> {
     return this.bitstreamDataService
-      .findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, this.getMetadataFilters(), options, false, false, followLink('thumbnail'))
+      .findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, this.getMetadataFilters(), options,
+        false, false, followLink('thumbnail'), followLink('format'))
       .pipe(
         getFirstCompletedRemoteData(),
         map((response: RemoteData<PaginatedList<Bitstream>>) => {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/valuepair/valuepair.component.spec.ts

@@ -6,8 +6,8 @@ import { TranslateLoaderMock } from '../../../../../../../shared/mocks/translate
 import { VocabularyService } from '../../../../../../../core/submission/vocabularies/vocabulary.service';
 import { Item } from '../../../../../../../core/shared/item.model';
 import { EMPTY, of } from 'rxjs';
-import {AuthService} from '../../../../../../../core/auth/auth.service';
-import {AuthServiceStub} from '../../../../../../../shared/testing/auth-service.stub';
+import { AuthService } from '../../../../../../../core/auth/auth.service';
+import { AuthServiceStub } from '../../../../../../../shared/testing/auth-service.stub';
 import { LayoutField } from '../../../../../../../core/layout/models/box.model';
 import { DsDatePipe } from '../../../../../../pipes/ds-date.pipe';
 
@@ -76,14 +76,18 @@ describe('ValuepairComponent', () => {
         return of('Italian');
       case 'common_iso_languages/en':
         return of('English');
-      case 'types':
+      case 'types/types:asd':
         return of('Value');
       default:
         return EMPTY;
     }
   };
 
-  const vocabularyServiceSpy = jasmine.createSpyObj('vocabularyService', { getPublicVocabularyEntryByValue: EMPTY });
+  const vocabularyServiceSpy =
+    jasmine.createSpyObj(
+      'vocabularyService',
+      { getPublicVocabularyEntryByValue: EMPTY, getPublicVocabularyEntryByID: EMPTY }
+    );
 
   describe('when the vocabulary has no authority', () => {
 
@@ -162,7 +166,7 @@ describe('ValuepairComponent', () => {
     beforeEach(() => {
       fixture = TestBed.createComponent(ValuepairComponent);
       component = fixture.componentInstance;
-      vocabularyServiceSpy.getPublicVocabularyEntryByValue.and.callFake(vocabularyEntriesMock);
+      vocabularyServiceSpy.getPublicVocabularyEntryByID.and.callFake(vocabularyEntriesMock);
       fixture.detectChanges();
     });
 
@@ -172,7 +176,7 @@ describe('ValuepairComponent', () => {
 
 
     it('should ...', () => {
-      expect(vocabularyService.getPublicVocabularyEntryByValue).toHaveBeenCalledWith(VOCABULARY_NAME_2, 'asd');
+      expect(vocabularyService.getPublicVocabularyEntryByID).toHaveBeenCalledWith(VOCABULARY_NAME_2, `${VOCABULARY_NAME_2}:asd`);
     });
 
 

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/valuepair/valuepair.component.ts

@@ -1,14 +1,15 @@
 import { Component, Inject, OnInit } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, interval, race } from 'rxjs';
-import { map, mapTo, take } from 'rxjs/operators';
+import { BehaviorSubject } from 'rxjs';
+import { map, take } from 'rxjs/operators';
 
 import { FieldRenderingType, MetadataBoxFieldRendering } from '../metadata-box.decorator';
 import { VocabularyService } from '../../../../../../../core/submission/vocabularies/vocabulary.service';
 import {
-  getFirstSucceededRemoteDataPayload,
-  getPaginatedListPayload
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload
 } from '../../../../../../../core/shared/operators';
 import { AuthService } from '../../../../../../../core/auth/auth.service';
 import { RenderingTypeValueModelComponent } from '../rendering-type-value.model';
@@ -49,21 +50,20 @@ export class ValuepairComponent extends RenderingTypeValueModelComponent impleme
 
     const vocabularyName = this.renderingSubType;
     const authority = this.metadataValue.authority ? this.metadataValue.authority.split(':') : undefined;
-    const isControlledVocabulary =  authority?.length > 1 && authority[0] === vocabularyName;
-    const metadataValue = isControlledVocabulary ? authority[1] : this.metadataValue.value;
+    const isControlledVocabulary = authority?.length > 1 && authority[0] === vocabularyName;
 
-    const entry$ = this.vocabularyService.getPublicVocabularyEntryByValue(vocabularyName, metadataValue).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      getPaginatedListPayload(),
-      map((res) => res[0]?.display ?? this.metadataValue.value),
-    );
-
-    // fallback values to be shown if the display value cannot be retrieved
-    const initValue$ = interval(5000).pipe(mapTo(this.metadataValue.value));
+    let vocabularyEntry$ = isControlledVocabulary ?
+      this.vocabularyService.getPublicVocabularyEntryByID(vocabularyName, this.metadataValue.authority) :
+      this.vocabularyService.getPublicVocabularyEntryByValue(vocabularyName, this.metadataValue.value);
 
-    race([entry$, initValue$]).pipe(take(1)).subscribe((value: string) => {
-      this.value$.next(value);
-    });
+    vocabularyEntry$.pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+      map((res) => res?.length > 0 ? res[0] : null),
+      map((res) => res?.display ?? this.metadataValue.value),
+      take(1)
+    ).subscribe(value => this.value$.next(value));
 
   }