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

Author: FrancescoMolinaro

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/bitstream-attachment/attachment-render/types/iiif-toolbar/iiif-toolbar.component.ts

@@ -22,6 +22,11 @@ import { Bitstream } from '../../../../../../../../../../../core/shared/bitstrea
 })
 @AttachmentTypeRendering(AttachmentRenderingType.IIIF, true)
 export class IIIFToolbarComponent implements OnInit {
+  private readonly MD_CANVASID = 'bitstream.iiif.canvasid';
+  private readonly MD_BITSTREAMS_MAP = [{
+    param: 'canvasId',
+    metadata: this.MD_CANVASID
+  }];
 
   @Input()
   item: Item;
@@ -40,6 +45,9 @@ export class IIIFToolbarComponent implements OnInit {
 
   isAuthorized$ = of(false);
 
+  queryParams: {[key: string]: string};
+
+
   getObjectUrl() {
     return isNotEmpty(this.bitstream) ? this.bitstream.self : undefined;
   }
@@ -57,13 +65,14 @@ export class IIIFToolbarComponent implements OnInit {
     this.manifestUrl = environment.rest.baseUrl + '/iiif/' + this.item.id + '/manifest';
     this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, this.getObjectUrl());
     this.iiifEnabled = this.isIIIFEnabled();
+    this.queryParams = this.getQueryParams();
   }
 
   async openMiradorViewer() {
     if (environment.advancedAttachmentRendering.showViewerOnSameItemPage) {
-      await this.router.navigate([ getItemViewerDetailsPath(this.item, 'iiif', this.tabName) ], { fragment: 'viewer' });
+      await this.router.navigate([ getItemViewerDetailsPath(this.item, 'iiif', this.tabName) ], { fragment: 'viewer', queryParams: this.queryParams });
     } else {
-      await this.router.navigate([ getItemViewerPath(this.item, 'iiif') ]);
+      await this.router.navigate([ getItemViewerPath(this.item, 'iiif') ], {queryParams: this.queryParams});
     }
   }
 
@@ -87,4 +96,11 @@ export class IIIFToolbarComponent implements OnInit {
     return regexIIIFItem.test(this.item.firstMetadataValue('dspace.iiif.enabled'));
   }
 
+  private getQueryParams() {
+    return this.MD_BITSTREAMS_MAP
+      .filter(({metadata}) => this.bitstream?.metadata[`${metadata}`]?.length > 0)
+      .map(({param,  metadata}) => ({ [`${param}`]: this.bitstream?.metadata[`${metadata}`][0]?.value }))
+      .reduce((acc, curr) => ({ ...acc, ...curr }), {});
+  }
+
 }

src/app/item-page/mirador-viewer/mirador-viewer.component.ts

@@ -92,12 +92,12 @@ export class MiradorViewerComponent implements OnInit {
     if (this.notMobile) {
       viewerPath += '&notMobile=true';
     }
-    if (environment.mirador.enableDownloadPlugin) {
-      viewerPath += '&enableDownloadPlugin=true';
-    }
     if (this.canvasId) {
       viewerPath += `&canvasId=${this.canvasId}`;
     }
+    if (environment.mirador.enableDownloadPlugin) {
+      viewerPath += '&enableDownloadPlugin=true';
+    }
 
     // TODO: Should the query term be trusted here?
     return this.sanitizer.bypassSecurityTrustResourceUrl(viewerPath);

src/app/item-page/viewer-provider/viewers/item-viewers/iiif-item-viewer/iiif-item-viewer.component.html

@@ -4,5 +4,6 @@
     [object]="item$ | async"
     [searchable]="isSearchable$ | async"
     [query]="query$ | async"
+    [canvasId]="canvasId$ | async"
   ></ds-mirador-viewer>
 </div>

src/app/item-page/viewer-provider/viewers/item-viewers/iiif-item-viewer/iiif-item-viewer.component.ts

@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { BaseItemViewerComponent } from '../base-item-viewer.component';
 import { RouteService } from '../../../../../core/services/route.service';
-import { filter, map, switchMap, withLatestFrom } from 'rxjs/operators';
-import { Observable } from 'rxjs';
-import { getDSpaceQuery, isIiifSearchEnabled } from '../../../shared/viewer-provider.utils';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { Observable, OperatorFunction } from 'rxjs';
+import { isIiifSearchEnabled } from '../../../shared/viewer-provider.utils';
+import { ActivatedRoute, ParamMap } from '@angular/router';
 
 @Component({
   selector: 'ds-iiif-item-viewer',
@@ -12,24 +13,37 @@ import { getDSpaceQuery, isIiifSearchEnabled } from '../../../shared/viewer-prov
 })
 export class IIIFItemViewerComponent extends BaseItemViewerComponent implements OnInit {
 
+  private readonly CANVAS_PARAM: string = 'canvasId';
+  private readonly QUERY_PARAM: string = 'query';
+
   isSearchable$: Observable<boolean>;
   query$: Observable<string>;
+  canvasId$: Observable<string>;
 
   constructor(
-    private readonly routeService: RouteService
+    private readonly routeService: RouteService,
+    private route: ActivatedRoute
   ) {
     super();
   }
 
   ngOnInit(): void {
+    const queryParams$ = this.route.queryParamMap.pipe(
+      filter(queryMap => queryMap != null),
+    );
+    this.canvasId$ = queryParams$.pipe(
+      this.extractParam(queryMap => queryMap.get(this.CANVAS_PARAM))
+    );
     this.isSearchable$ = this.item$.pipe(
       map((item) => isIiifSearchEnabled(item))
     );
-    this.query$ = this.item$.pipe(
-      withLatestFrom(this.isSearchable$),
-      filter(([, isSearchable]) => !!isSearchable),
-      switchMap(([item]) => getDSpaceQuery(item, this.routeService))
+    this.query$ = this.isSearchable$.pipe(
+      filter((isSearchable) => !!isSearchable),
+      switchMap(() => queryParams$.pipe(this.extractParam(queryMap => queryMap.get(this.QUERY_PARAM))))
     );
   }
 
+  private extractParam<T>(mapper: (queryMap: ParamMap) => T): OperatorFunction<ParamMap, T> {
+    return map(mapper);
+  }
 }