Merged dspace-cris-2023_02_x into task/dspace-cris-2023_02_x/DSC-1957_II

Author: atarix83

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "2023.02.06-SNAPHOT",
+  "version": "2023.02.07-SNAPSHOT",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",

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

@@ -176,7 +176,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
       searchParams.push(new RequestParam('sequenceId', sequenceId));
     }
     if (hasValue(filename)) {
-      searchParams.push(new RequestParam('filename', encodeURIComponent(filename)));
+      searchParams.push(new RequestParam('filename', filename));
     }
 
     const hrefObs = this.getSearchByHref(

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/cris-layout/cris-layout-loader/cris-layout-horizontal/cris-layout-navbar/cris-layout-navbar.component.html

@@ -11,11 +11,11 @@
             <div id="collapsingNav">
                 <ul class="navbar-nav mr-auto shadow-none">
                     <ng-container *ngIf="!!(activeTab$ |async)">
-                        <ds-cris-layout-sidebar-item *ngFor="let tab of tabs;" [tab]="tab" [layout]="'horizontal'" [activeTab]="(activeTab$ |async)"
+                        <ds-cris-layout-sidebar-item *ngFor="let tab of tabs;" [itemBaseUrl]="itemBaseUrl" [tab]="tab" [layout]="'horizontal'" [activeTab]="(activeTab$ |async)"
                             (tabSelectedChange)="setActiveTab($event)"></ds-cris-layout-sidebar-item>
                     </ng-container>
                 </ul>
             </div>
         </div>
     </div>
-</nav>
+</nav>

src/app/cris-layout/cris-layout-loader/cris-layout-vertical/cris-layout-sidebar/cris-layout-sidebar.component.html

@@ -4,7 +4,7 @@
     <div>
       <ul class="list-unstyled components mb-5">
         <ng-container *ngIf="!!(activeTab$ |async)">
-          <ds-cris-layout-sidebar-item *ngFor="let tab of tabs;" [tab]="tab" [layout]="'vertical'" [activeTab]="(activeTab$ |async)"
+          <ds-cris-layout-sidebar-item *ngFor="let tab of tabs;" [itemBaseUrl]="itemBaseUrl" [tab]="tab" [layout]="'vertical'" [activeTab]="(activeTab$ |async)"
             (tabSelectedChange)="setActiveTab($event)"></ds-cris-layout-sidebar-item>
         </ng-container>
       </ul>