Merge branch 'ux-plus-2023_02_x' into task/ux-plus-2023_02_x/UXP-34-rework

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/core/data/site-data.service.ts

@@ -46,17 +46,27 @@ export class SiteDataService extends IdentifiableDataService<Site> implements Fi
 
   /**
    * Retrieve the Site Object
+   *
+   * @param options                     Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
    */
-  find(): Observable<Site> {
+  find(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Site>[]): Observable<Site> {
     const searchParams: RequestParam[] = [new RequestParam('projection', 'allLanguages')];
-    const options = Object.assign(new FindListOptions(), { searchParams });
-    return this.findAll(options).pipe(
+    const findOptions = Object.assign(new FindListOptions(), options, { searchParams });
+    return this.findAll(findOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       getFirstCompletedRemoteData(),
       switchMap((remoteData: RemoteData<PaginatedList<Site>>) => {
         if (remoteData.hasSucceeded) {
           return of(remoteData.payload.page[0]);
         } else {
-          return this.findAll().pipe(
+          return this.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
             getFirstCompletedRemoteData(),
             map((rd: RemoteData<PaginatedList<Site>>) => rd.hasSucceeded ? rd.payload.page[0] : null)
           );

src/app/home-page/home-page.resolver.ts

@@ -20,6 +20,6 @@ export class HomePageResolver implements Resolve<Site> {
    * @returns Observable<Site> Emits the found Site object, or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Site> | Promise<Site> | Site {
-    return this.siteService.find().pipe(take(1));
+    return this.siteService.find(null, false).pipe(take(1));
   }
 }

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

@@ -1,8 +1,8 @@
-<div class="pb-3">
-    <div *ngIf="item && !item.isDiscoverable" class="private-warning">
+<div *ngIf="item && (!item.isDiscoverable || item.isWithdrawn)" class="pb-3">
+    <div *ngIf="!item.isDiscoverable" class="private-warning">
         <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
     </div>
-    <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
+    <div *ngIf="item.isWithdrawn" class="withdrawn-warning">
         <ds-alert [type]="AlertTypeEnum.Warning">
             <div class="d-flex justify-content-between flex-wrap flex-column">
                 <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>

src/app/item-page/simple/item-page.component.scss

@@ -4,7 +4,3 @@
     max-width: none;
   }
 }
-
-.container {
-  margin-top: calc(-1 * var(--ds-content-spacing));
-}

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);
   });
+
+  });
 });