Merged in ux-plus-2023_02_x-UXP-123 (pull request DSpace#1395)

Ux plus 2023 02 x UXP-123

Approved-by: Giuseppe Digilio

Author: alisaismailati

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/advanced-attachment/advanced-attachment.component.spec.ts

@@ -152,6 +152,7 @@ describe('AdvancedAttachmentComponent', () => {
         { provide: 'fieldProvider', useValue: mockField },
         { provide: 'itemProvider', useValue: testItem },
         { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: AuthorizationDataService, useValue: mockAuthorizedService },
       ],

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

@@ -41,10 +41,11 @@ export class AdvancedAttachmentComponent extends AttachmentComponent implements
     @Inject('fieldProvider') public fieldProvider: LayoutField,
     @Inject('itemProvider') public itemProvider: Item,
     @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
+    @Inject('tabNameProvider') public tabNameProvider: string,
     protected bitstreamDataService: BitstreamDataService,
     protected translateService: TranslateService
   ) {
-    super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
+    super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
   }
 
   getBitstreamsByItem(options?: FindListOptions): Observable<PaginatedList<Bitstream>> {

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

@@ -36,6 +36,10 @@ export class AttachmentRenderComponent implements OnInit {
    * The bitstream
    */
   @Input() renderingType: AttachmentRenderingType | string;
+  /**
+   * The tab name
+   */
+  @Input() tabName: string;
 
   /**
    * Directive hook used to place the dynamic render component
@@ -77,6 +81,7 @@ export class AttachmentRenderComponent implements OnInit {
       attachentComponentRef = this.attachmentValueViewRef.createComponent(factory, 0, this.getComponentInjector());
       (attachentComponentRef.instance as any).item = this.item;
       (attachentComponentRef.instance as any).bitstream = this.bitstream;
+      (attachentComponentRef.instance as any).tabName = this.tabName;
     }
     return attachentComponentRef;
   }
@@ -87,7 +92,8 @@ export class AttachmentRenderComponent implements OnInit {
   getComponentInjector() {
     const providers = [
       {provide: 'itemProvider', useValue: this.item, deps: []},
-      {provide: 'bitstreamProvider', useValue: this.bitstream, deps: []}
+      {provide: 'bitstreamProvider', useValue: this.bitstream, deps: []},
+      {provide: 'tabNameProvider', useValue: this.tabName, deps: []}
     ];
 
     return Injector.create({

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

@@ -28,6 +28,10 @@ export class IIIFToolbarComponent implements OnInit {
 
   @Input()
   bitstream: Bitstream;
+  /**
+   * The tab name
+   */
+  @Input() tabName: string;
 
   // The path to the REST manifest endpoint.
   manifestUrl: string;
@@ -57,7 +61,7 @@ export class IIIFToolbarComponent implements OnInit {
 
   async openMiradorViewer() {
     if (environment.advancedAttachmentRendering.showViewerOnSameItemPage) {
-      await this.router.navigate([ getItemViewerDetailsPath(this.item, 'iiif') ], { fragment: 'viewer' });
+      await this.router.navigate([ getItemViewerDetailsPath(this.item, 'iiif', this.tabName) ], { fragment: 'viewer' });
     } else {
       await this.router.navigate([ getItemViewerPath(this.item, 'iiif') ]);
     }

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

@@ -32,6 +32,10 @@ export class MediaViewerButtonComponent implements OnInit {
    * The bitstream
    */
   @Input() bitstream: Bitstream;
+  /**
+   * The tab name
+   */
+  @Input() tabName: string;
 
   showButton$!: Observable<boolean>;
 
@@ -46,7 +50,7 @@ export class MediaViewerButtonComponent implements OnInit {
 
   async openViewer() {
     if (environment.advancedAttachmentRendering.showViewerOnSameItemPage) {
-      await this.router.navigate([getBitstreamItemViewerDetailsPath(this.item, this.bitstream, 'media')], {fragment: 'viewer'});
+      await this.router.navigate([getBitstreamItemViewerDetailsPath(this.item, this.bitstream, 'media', this.tabName)], {fragment: 'viewer'});
     } else {
       await this.router.navigate([getBitstreamItemViewerPath(this.item, this.bitstream, 'media')]);
     }

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

@@ -32,6 +32,10 @@ export class PdfViewerButtonComponent implements OnInit {
    * The bitstream
    */
   @Input() bitstream: Bitstream;
+  /**
+   * The tab name
+   */
+  @Input() tabName: string;
 
   constructor(
     private router: Router,
@@ -46,7 +50,7 @@ export class PdfViewerButtonComponent implements OnInit {
 
   public async openPdfViewer() {
     if (environment.advancedAttachmentRendering.showViewerOnSameItemPage) {
-      await this.router.navigate([ getBitstreamItemViewerDetailsPath(this.item, this.bitstream, 'pdf') ], { fragment: 'viewer' });
+      await this.router.navigate([ getBitstreamItemViewerDetailsPath(this.item, this.bitstream, 'pdf', this.tabName) ], { fragment: 'viewer' });
     } else {
       await this.router.navigate([ getBitstreamItemViewerPath(this.item, this.bitstream, 'pdf') ]);
     }

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

@@ -9,12 +9,12 @@
       <div class="d-flex flex-column align-items-end gap-3">
         <ng-container *ngFor="let renderingType of allAttachmentProviders">
           <div class="text-nowrap">
-            <ds-attachment-render [renderingType]="renderingType" [bitstream]="attachment" [item]="item"></ds-attachment-render>
+            <ds-attachment-render [renderingType]="renderingType" [bitstream]="attachment" [item]="item" [tabName]="tabName"></ds-attachment-render>
           </div>
         </ng-container>
         <!-- Default download button -->
         <div class="text-nowrap">
-          <ds-attachment-render [renderingType]="AttachmentRenderingType.DOWNLOAD" [bitstream]="attachment" [item]="item"></ds-attachment-render>
+          <ds-attachment-render [renderingType]="AttachmentRenderingType.DOWNLOAD" [bitstream]="attachment" [item]="item" [tabName]="tabName"></ds-attachment-render>
         </div>
       </div>
     </div>

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

@@ -18,6 +18,7 @@ describe('BitstreamAttachmentComponent', () => {
         {provide: 'fieldProvider', useValue: {}},
         {provide: 'itemProvider', useValue: {}},
         {provide: 'renderingSubTypeProvider', useValue: ''},
+        {provide: 'tabNameProvider', useValue: '' },
         {provide: BitstreamDataService, useValue: {}},
         {provide: TranslateService, useValue: {}},
       ],

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

@@ -41,12 +41,13 @@ export class BitstreamAttachmentComponent extends BitstreamRenderingModelCompone
     @Inject('fieldProvider') public fieldProvider: LayoutField,
     @Inject('itemProvider') public itemProvider: Item,
     @Inject('renderingSubTypeProvider') public renderingSubTypeProvider: string,
+    @Inject('tabNameProvider') public tabNameProvider: string,
     protected readonly bitstreamDataService: BitstreamDataService,
     protected readonly translateService: TranslateService,
     protected readonly router: Router,
     protected readonly route: ActivatedRoute,
   ) {
-    super(fieldProvider, itemProvider, renderingSubTypeProvider, bitstreamDataService, translateService);
+    super(fieldProvider, itemProvider, renderingSubTypeProvider, tabNameProvider, bitstreamDataService, translateService);
   }
 
   ngOnInit() {

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.spec.ts

@@ -152,6 +152,7 @@ describe('AttachmentComponent', () => {
         { provide: 'fieldProvider', useValue: mockField },
         { provide: 'itemProvider', useValue: testItem },
         { provide: 'renderingSubTypeProvider', useValue: '' },
+        { provide: 'tabNameProvider', useValue: '' },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: AuthorizationDataService, useValue: mockAuthorizedService },
       ],