138928: moved PdfViewerConfig + accessibility fixes

Author: bram-maegerman

src/app/pdf-viewer/pdf-viewer-enable-dso/pdf-viewer-enable-dso.component.html

@@ -8,7 +8,7 @@ <h3 class="mt-3">{{ 'pdf-viewer.enable-viewer.title' |translate }}</h3>
     <div>
       <hr>
       <div class="mb-3 row">
-        <div class="col text-end">
+        <div class="col text-end space-children-mr">
           <button (click)="back()" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{ 'pdf-viewer.enable-viewer.return' | translate }}
           </button>

src/app/pdf-viewer/pdf-viewer-enable/pdf-viewer-enable.component.ts

@@ -43,11 +43,11 @@ export class PdfViewerEnableComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.isEnabled$ = this.pdfViewerService.isViewerEnabled(this.dso);
+    this.isEnabled$ = this.pdfViewerService.isViewerEnabled$(this.dso);
     this.isEnabled$.pipe(
       take(1),
     ).subscribe((isEnabled) => this.update(isEnabled));
-    this.isViewerConfigAllowed$ = this.pdfViewerService.viewerAllowedForBitstreamFormat(this.dso);
+    this.isViewerConfigAllowed$ = this.pdfViewerService.viewerAllowedForBitstreamFormat$(this.dso);
   }
 
   update($event: boolean) {

src/app/pdf-viewer/pdf-viewer-service/pdf-viewer-service.ts

@@ -46,9 +46,9 @@ export class PdfViewerService {
    * Is the user allowed to visit the PDF viewer for a given bitstream
    * @param bitstream The bitstream to view
    */
-  viewerAllowed(bitstream: Bitstream): Observable<boolean> {
-    return combineLatest([this.viewerAllowedForBitstreamFormat(bitstream),
-      this.isViewerEnabled(bitstream)]).pipe(
+  viewerAllowed$(bitstream: Bitstream): Observable<boolean> {
+    return combineLatest([this.viewerAllowedForBitstreamFormat$(bitstream),
+      this.isViewerEnabled$(bitstream)]).pipe(
       map(([viewerAllowed, viewerEnabled]) => viewerAllowed && viewerEnabled),
     );
   }
@@ -59,7 +59,7 @@ export class PdfViewerService {
    * is a pdf when the dso is a bitstream
    * @param dso The dspace object to check
    */
-  viewerAllowedForBitstreamFormat(dso: DSpaceObject): Observable<boolean> {
+  viewerAllowedForBitstreamFormat$(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Bitstream) {
       return this.bitstreamFormatService.findByBitstream(dso).pipe(
         getAllSucceededRemoteDataPayload(),
@@ -74,7 +74,7 @@ export class PdfViewerService {
    * Is the viewer enabled for this dspace object
    * @param dsoToCheck  The dspace object to check
    */
-  isViewerEnabled(dsoToCheck: DSpaceObject): Observable<boolean> {
+  isViewerEnabled$(dsoToCheck: DSpaceObject): Observable<boolean> {
     return of(dsoToCheck).pipe(
       expand((dso: DSpaceObject) => {
         if (hasValue(dso) && typeof (dso as any).firstMetadataValue === 'function' && hasNoValue(dso.firstMetadataValue('dspace.pdfviewer.enabled')) && typeof (dso as any).getParentLinkKey === 'function') {
@@ -95,10 +95,10 @@ export class PdfViewerService {
       toArray(),
       map((dsos: DSpaceObject[]) => {
         const dsosWithViewerInfo = dsos.filter((dso) => dso.firstMetadataValue('dspace.pdfviewer.enabled'));
-        if (isNotEmpty(dsosWithViewerInfo)) {
+        if (isNotEmpty(dsosWithViewerInfo) && environment.pdfViewer.enabled) {
           return dsosWithViewerInfo[0].firstMetadataValue('dspace.pdfviewer.enabled') === 'true';
         } else {
-          return environment.pdfViewer?.enabled ?? true;
+          return environment.pdfViewer.enabled;
         }
       }),
     );

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

@@ -51,11 +51,11 @@
     }
     <ng-container *ngTemplateOutlet="content"></ng-container>
     <span>
-      <a [routerLink]="pdfViewerPath" [ngClass]="cssClasses"
+      <a role="link" [routerLink]="pdfViewerPath" [ngClass]="cssClasses"
          title="{{'pdf-viewer.link.view' | translate}}">
         <i class="fa fa-eye ms-2" ngbTooltip="{{'pdf-viewer.link.view' | translate}}"
            container="body"></i></a>
-      <a [routerLink]="(bitstreamPath$| async)?.routerLink" [queryParams]="(bitstreamPath$| async)?.queryParams"
+      <a role="link" [routerLink]="(bitstreamPath$| async)?.routerLink" [queryParams]="(bitstreamPath$| async)?.queryParams"
          [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses"
          title="{{'pdf-viewer.link.download' | translate}}">
         <i class="fa fa-file-download ms-2" ngbTooltip="{{'pdf-viewer.link.download' | translate}}"

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

@@ -134,7 +134,7 @@ export class FileDownloadLinkComponent implements OnInit {
     }
 
     this.pdfViewerPath = getPdfViewerRoute(this.bitstream.id);
-    this.pdfViewerAllowed$ = this.pdfViewerService.viewerAllowed(this.bitstream);
+    this.pdfViewerAllowed$ = this.pdfViewerService.viewerAllowed$(this.bitstream);
   }
 
   /**

src/config/app-config.interface.ts

@@ -2,6 +2,7 @@ import {
   InjectionToken,
   makeStateKey,
 } from '@angular/core';
+import { PdfViewerConfig } from '@dspace/config/pdf-viewer-config';
 
 import { AccessibilitySettingsConfig } from './accessibility-settings.config';
 import { ActuatorsConfig } from './actuators.config';
@@ -69,7 +70,7 @@ interface AppConfig extends Config {
   matomo?: MatomoConfig;
   geospatialMapViewer: GeospatialMapConfig;
   accessibility: AccessibilitySettingsConfig;
-  pdfViewer?: { enabled: boolean };
+  pdfViewer: PdfViewerConfig;
 }
 
 /**

src/config/default-app-config.ts

@@ -1,3 +1,5 @@
+import { PdfViewerConfig } from '@dspace/config/pdf-viewer-config';
+
 import { AccessibilitySettingsConfig } from './accessibility-settings.config';
 import { ActuatorsConfig } from './actuators.config';
 import { AdminNotifyMetricsRow } from './admin-notify-metrics.config';
@@ -647,4 +649,9 @@ export class DefaultAppConfig implements AppConfig {
   accessibility: AccessibilitySettingsConfig = {
     cookieExpirationDuration: 7,
   };
+
+  // PDF viewer configuration, used by the PdfViewerService
+  pdfViewer: PdfViewerConfig = {
+    enabled: true,
+  };
 }

src/config/pdf-viewer-config.ts

@@ -0,0 +1,9 @@
+import { Config } from './config.interface';
+
+export class PdfViewerConfig implements Config {
+
+  /**
+   * Whether the PDF viewer is enabled throughout the whole application
+   */
+  public enabled: boolean;
+}