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

Author: atarix83

src/app/collection-page/collection-page.component.ts

@@ -119,7 +119,8 @@ export class CollectionPageComponent implements OnInit {
               pagination: currentPagination,
               sort: currentSort,
               dsoTypes: [DSpaceObjectType.ITEM],
-              forcedEmbeddedKeys: ['metrics']
+              forcedEmbeddedKeys: ['metrics'],
+              projection: 'preventMetadataSecurity'
             }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
             .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
         }),

src/app/core/browse/browse-entry-search-options.model.ts

@@ -16,6 +16,8 @@ export class BrowseEntrySearchOptions {
               public sort?: SortOptions,
               public startsWith?: string,
               public scope?: string,
-              public fetchThumbnail?: boolean) {
+              public fetchThumbnail?: boolean,
+              public projection?: string,
+  ) {
   }
 }

src/app/core/browse/browse.service.ts

@@ -148,6 +148,9 @@ export class BrowseService {
         if (isNotEmpty(filterAuthority)) {
           args.push(`filterAuthority=${encodeURIComponent(filterAuthority)}`);
         }
+        if (isNotEmpty(options.projection)) {
+          args.push(`projection=${options.projection}`);
+        }
         if (isNotEmpty(args)) {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();
         }

src/app/core/browse/search-manager.ts

@@ -45,7 +45,8 @@ export class SearchManager {
    * @returns {Observable<RemoteData<PaginatedList<Item>>>}
    */
   getBrowseItemsFor(filterValue: string, filterAuthority: string, options: BrowseEntrySearchOptions, ...linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<PaginatedList<Item>>> {
-    return this.browseService.getBrowseItemsFor(filterValue, filterAuthority, options, ...linksToFollow)
+    const browseOptions = Object.assign({}, options, { projection: 'preventMetadataSecurity' });
+    return this.browseService.getBrowseItemsFor(filterValue, filterAuthority, browseOptions, ...linksToFollow)
       .pipe(this.completeWithExtraData());
   }
 

src/app/core/browse/search.manager.spec.ts

@@ -130,13 +130,13 @@ describe('SearchManager', () => {
 
       const filterValue = 'filterValue';
       const filterAuthority = null;
-      const options: BrowseEntrySearchOptions = { options: null} as any;
+      const browseOptions: BrowseEntrySearchOptions = Object.assign({}, { projection: 'preventMetadataSecurity' }) as BrowseEntrySearchOptions;
       const followLink: FollowLinkConfig<any> = {} as any;
 
-      scheduler.schedule(() => service.getBrowseItemsFor(filterValue, filterAuthority, options, followLink).subscribe());
+      scheduler.schedule(() => service.getBrowseItemsFor(filterValue, filterAuthority, browseOptions, followLink).subscribe());
       scheduler.flush();
 
-      expect(mockBrowseService.getBrowseItemsFor).toHaveBeenCalledWith(filterValue, null, options, followLink);
+      expect(mockBrowseService.getBrowseItemsFor).toHaveBeenCalledWith(filterValue, null, browseOptions, followLink);
       expect(mockItemService.findAllById).toHaveBeenCalledWith([validAuthority, validAuthority2]);
 
     });
@@ -145,13 +145,13 @@ describe('SearchManager', () => {
 
       const filterValue = 'filterValue';
       const filterAuthority = 'filterAuthority';
-      const options: BrowseEntrySearchOptions = { options: null} as any;
+      const browseOptions: BrowseEntrySearchOptions = Object.assign({}, { projection: 'preventMetadataSecurity' }) as BrowseEntrySearchOptions;
       const followLink: FollowLinkConfig<any> = {} as any;
 
-      scheduler.schedule(() => service.getBrowseItemsFor(filterValue, filterAuthority, options, followLink).subscribe());
+      scheduler.schedule(() => service.getBrowseItemsFor(filterValue, filterAuthority, browseOptions, followLink).subscribe());
       scheduler.flush();
 
-      expect(mockBrowseService.getBrowseItemsFor).toHaveBeenCalledWith(filterValue, filterAuthority, options, followLink);
+      expect(mockBrowseService.getBrowseItemsFor).toHaveBeenCalledWith(filterValue, filterAuthority, browseOptions, followLink);
       expect(mockItemService.findAllById).toHaveBeenCalledWith([validAuthority, validAuthority2]);
 
     });

src/app/item-page/alerts/item-alerts.component.html

@@ -1,4 +1,4 @@
-<div class="pb-3">
+<div class="py-3">
     <div *ngIf="item && !item.isDiscoverable" class="private-warning">
         <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
     </div>

src/app/lucky-search/search/lucky-search.component.spec.ts

@@ -78,7 +78,7 @@ describe('LuckySearchComponent', () => {
     index: 'test',
     'value': 'test'
   };
-  const routerStub = new RouterMock();
+  let routerStub = new RouterMock();
 
   const bitstreamMetadata = {
     'dc.title': [{value: 'test.pdf'} as MetadataValue],
@@ -106,10 +106,8 @@ describe('LuckySearchComponent', () => {
       .compileComponents();
   });
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LuckySearchComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
+  afterEach(() => {
+    routerStub = new RouterMock();
   });
 
   describe('should search items', () => {
@@ -284,6 +282,12 @@ describe('LuckySearchComponent', () => {
     });
   });
 
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(LuckySearchComponent);
+      component = fixture.componentInstance;
+    });
+
   it('should not redirect when no bitstreams are found', () => {
     const item = Object.assign(new Item(), {uuid: 'item-uuid-1', name: 'Test item 1'});
     const data = createSuccessfulRemoteDataObject(createPaginatedList([
@@ -298,6 +302,7 @@ describe('LuckySearchComponent', () => {
   });
 
   it('should update showEmptySearchSection$ when no results are found', () => {
+      fixture.detectChanges();
     const emptyResults = createSuccessfulRemoteDataObject(createPaginatedList([]));
 
     spyOn(component as any, 'getLuckySearchResults').and.returnValue(observableOf(emptyResults));
@@ -307,4 +312,6 @@ describe('LuckySearchComponent', () => {
 
     expect(component.showEmptySearchSection$.getValue()).toBe(true);
   });
+
+  });
 });

src/app/shared/search/models/paginated-search-options.model.ts

@@ -14,12 +14,13 @@ export class PaginatedSearchOptions extends SearchOptions {
   sort?: SortOptions;
   forcedEmbeddedKeys?: string[];
 
-  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions, view?: ViewMode, forcedEmbeddedKeys?: string[]}) {
+  constructor(options: {configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[], fixedFilter?: any, pagination?: PaginationComponentOptions, sort?: SortOptions, view?: ViewMode, forcedEmbeddedKeys?: string[], projection?: string}) {
     super(options);
     this.pagination = options.pagination;
     this.sort = options.sort;
     this.view = options.view;
     this.forcedEmbeddedKeys = options.forcedEmbeddedKeys;
+    this.projection = options.projection; // optional projection parameter for the search results
   }
 
   /**