Merged in task/dspace-cris-2024_02_x/DSC-395 (pull request DSpace#4292)

[DSC-395] add configuration to open bitstreams in new tabs

Approved-by: Francesco Molinaro

Author: Andrea Barbasso

config/config.example.yml

@@ -381,6 +381,10 @@ item:
     # Rounded to the nearest size in the list of selectable sizes on the
     # settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: 5
+    # Show the bitstream access status label on the item page
+    showAccessStatuses: false
+    # Open bitstream download links in a new browser tab by default
+    openDownloadLinksInNewTab: true
   # The maximum number of metadata values to add to the metatag list of the item page
   metatagLimit: 20
   # The maximum number of values for repeatable metadata to show in the full item

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/file-download-button/file-download-button.component.html

@@ -2,19 +2,22 @@
   <ng-container *ngIf="bitstreamPath$ | async as bitstreamLink">
     <ng-container *ngIf="canDownload$ | async; then downloadButtonTpl; else requestACopyTpl"></ng-container>
     <ng-template #downloadButtonTpl>
-      <button [routerLink]="bitstreamLink?.routerLink" [queryParams]="bitstreamLink?.queryParams" class="btn btn-outline-primary"
+      <a [routerLink]="bitstreamLink?.routerLink" [queryParams]="bitstreamLink?.queryParams"
+         [target]="isBlank ? '_blank' : '_self'"
+        class="btn btn-outline-primary"
               data-test="download">
         <i class="fas fa-download"></i> {{ 'cris-layout.advanced-attachment.download' | translate }}
-      </button>
+      </a>
     </ng-template>
     <ng-template #requestACopyTpl>
-      <button [routerLink]="bitstreamLink?.routerLink"
+      <a [routerLink]="bitstreamLink?.routerLink"
               [queryParams]="bitstreamLink?.queryParams"
+              [target]="isBlank ? '_blank' : '_self'"
               [dsBtnDisabled]="(canRequestItemCopy$ | async) !== true"
               class="btn btn-outline-primary"
               data-test="requestACopy">
         {{ 'cris-layout.advanced-attachment.requestACopy' | translate }}
-      </button>
+      </a>
     </ng-template>
   </ng-container>
 </ng-container>

src/app/shared/file-download-link/file-download-link.component.spec.ts

@@ -8,11 +8,16 @@ import {
   ActivatedRoute,
   RouterLink,
 } from '@angular/router';
+import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import {
   cold,
   getTestScheduler,
 } from 'jasmine-marbles';
+import {
+  APP_CONFIG,
+  APP_DATA_SERVICES_MAP,
+} from 'src/config/app-config.interface';
 
 import { getBitstreamModuleRoute } from '../../app-routing-paths';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
@@ -21,6 +26,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
@@ -38,6 +44,24 @@ describe('FileDownloadLinkComponent', () => {
   let bitstream: Bitstream;
   let item: Item;
   let configurationDataService: ConfigurationDataService;
+  let storeMock: any;
+
+  const mockAppConfig = {
+    item: {
+      bitstream: {
+        openDownloadLinksInNewTab: true,
+      },
+    },
+  };
+
+  const itemRequestStub = Object.assign(new ItemRequest(), {
+    token: 'item-request-token',
+    requestName: 'requester name',
+    accessToken: 'abc123',
+    acceptRequest: true,
+    accessExpired: false,
+    allfiles: true,
+  });
 
   function init() {
     authorizationService = jasmine.createSpyObj('authorizationService', {
@@ -72,6 +96,9 @@ describe('FileDownloadLinkComponent', () => {
       providers: [
         RouterLinkDirectiveStub,
         { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: Store, useValue: storeMock },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
+        { provide: APP_CONFIG, useValue: mockAppConfig },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
@@ -110,9 +137,19 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
           const link = fixture.debugElement.query(By.css('a'));
           expect(link.injector.get(RouterLinkDirectiveStub).routerLink).toContain(new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString());
+          expect(link.nativeElement.getAttribute('target')).toBe('_blank');
           const lock = fixture.debugElement.query(By.css('.fa-lock'));
           expect(lock).toBeNull();
         });
+
+        it('should keep an explicit isBlank input over the config default', () => {
+          component.isBlank = false;
+          component.ngOnInit();
+          scheduler.flush();
+          fixture.detectChanges();
+          const link = fixture.debugElement.query(By.css('a'));
+          expect(link.nativeElement.getAttribute('target')).toBe('_self');
+        });
       });
       describe('when the user has no download rights but has the right to request a copy', () => {
         beforeEach(waitForAsync(() => {

src/app/shared/file-download-link/file-download-link.component.ts

@@ -6,8 +6,10 @@ import {
 } from '@angular/common';
 import {
   Component,
+  Inject,
   Input,
   OnInit,
+  Optional,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,6 +28,10 @@ import {
   getRemoteDataPayload,
 } from 'src/app/core/shared/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import {
   getBitstreamDownloadRoute,
   getBitstreamRequestACopyRoute,
@@ -71,7 +77,7 @@ export class FileDownloadLinkComponent implements OnInit {
   /**
    * A boolean representing if link is shown in same tab or in a new one.
    */
-  @Input() isBlank = false;
+  @Input() isBlank: boolean;
 
   @Input() enableRequestACopy = true;
 
@@ -95,10 +101,13 @@ export class FileDownloadLinkComponent implements OnInit {
     private authorizationService: AuthorizationDataService,
     private configurationService: ConfigurationDataService,
     public dsoNameService: DSONameService,
+    @Optional() @Inject(APP_CONFIG) private appConfig?: AppConfig,
   ) {
   }
 
   ngOnInit() {
+    this.isBlank = this.isBlank ?? this.appConfig?.item?.bitstream?.openDownloadLinksInNewTab ?? true;
+
     if (this.enableRequestACopy) {
       this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       const canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);

src/config/default-app-config.ts

@@ -411,6 +411,8 @@ export class DefaultAppConfig implements AppConfig {
       // Rounded to the nearest size in the list of selectable sizes on the
       // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
       pageSize: 5,
+      // Open bitstream download links in a new browser tab by default
+      openDownloadLinksInNewTab: true,
     },
     // The maximum number of metadata values to add to the metatag list of the item page
     metatagLimit: 20,

src/config/item-config.interface.ts

@@ -12,6 +12,8 @@ export interface ItemConfig extends Config {
     // Rounded to the nearest size in the list of selectable sizes on the
     // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
     pageSize: number;
+    // Open bitstream download links in a new browser tab by default
+    openDownloadLinksInNewTab?: boolean;
   };
 
   // The maximum number of metadata values to add to the metatag list of the item page