From 929d8738df5dc208995dd2c0d4458db3c296719a Mon Sep 17 00:00:00 2001
From: guillermo2519 <escalante.guillermo2519@gmail.com>
Date: Wed, 29 Apr 2026 21:21:44 -0600
Subject: [PATCH 1/3] =?UTF-8?q?Fix=C2=A0#5555:=20downloads=20not=20working?=
 =?UTF-8?q?=20from=20Bitstreams=20tab=20and=20Workspace/Workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../item-edit-bitstream-bundle.component.html         |  2 +-
 .../upload/file/section-upload-file.component.spec.ts | 11 +++++++++++
 .../upload/file/section-upload-file.component.ts      |  8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 8ed06a93672..2801621fc99 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -97,7 +97,7 @@
                     headers="{{ entry.nameStripped }} {{ bundleName }} actions">
                     <div class="text-center w-100">
                       <div class="btn-group relationship-action-buttons">
-                        <a [href]="entry.downloadUrl"
+                        <a [routerLink]="entry.downloadUrl"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
                           class="btn btn-outline-primary btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index a44f2d6ddae..2a5950bdcc8 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -272,6 +272,17 @@ describe('SubmissionSectionUploadFileComponent', () => {
       expect(compAsAny.editBitstreamData).toHaveBeenCalled();
     });
 
+    it('should return a Bitstream with correct uuid and _links from fileData', () => {
+      comp.fileData = fileData;
+
+      const bitstream = comp.getBitstream();
+
+      expect(bitstream.uuid).toBe(fileData.uuid);
+      expect(bitstream._links.self.href).toBe(fileData.url);
+      expect(bitstream._links.content.href).toBe(fileData.url);
+      expect(bitstream._links.thumbnail.href).toBe('');
+    });
+
   });
 });
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index c6949bd3828..f1aa7be8b8f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -257,6 +257,14 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
   public getBitstream(): Bitstream {
     return Object.assign(new Bitstream(), {
       uuid: this.fileData.uuid,
+      _links: {
+        self: { href: this.fileData.url },
+        content: { href: this.fileData.url },
+        bundle: { href: '' },
+        format: { href: '' },
+        thumbnail: { href: this.fileData.thumbnail || '' },
+        accessStatus: { href: '' },
+      },
     });
   }
 

From fab4f4b6cbd6cd9db172c960e0976c1969e0ddc0 Mon Sep 17 00:00:00 2001
From: guillermo2519 <escalante.guillermo2519@gmail.com>
Date: Wed, 6 May 2026 23:33:23 -0600
Subject: [PATCH 2/3] Fix #5555: downloads not working from Workspace/Workflow
 submissions

---
 .../file/section-upload-file.component.html   |  8 +++--
 .../section-upload-file.component.spec.ts     | 16 +++++-----
 .../file/section-upload-file.component.ts     | 30 ++++++++-----------
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index c1cdf266aaf..eb7b05adc78 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -26,10 +26,12 @@
       </div>
       <div class="float-end w-15">
         <ng-container>
-          <ds-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
-            [bitstream]="getBitstream()" [enableRequestACopy]="false" [showAccessStatusBadge]="false">
+          <button class="btn btn-link-focus"
+            [attr.aria-label]="'submission.sections.upload.download.title' | translate"
+            title="{{ 'submission.sections.upload.download.title' | translate }}"
+            (click)="$event.preventDefault(); downloadFile()">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
-          </ds-file-download-link>
+          </button>
           <button class="btn btn-link-focus"
                   attr.aria-label="{{'submission.sections.upload.edit.title' | translate}} {{fileName}}"
                   title="{{ 'submission.sections.upload.edit.title' | translate }} {{fileName}}"
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index 2a5950bdcc8..51f34a68db2 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -15,6 +15,8 @@ import {
 import { By } from '@angular/platform-browser';
 import { JsonPatchOperationPathCombiner } from '@dspace/core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '@dspace/core/json-patch/builder/json-patch-operations-builder';
+import { HardRedirectService } from '@dspace/core/services/hard-redirect.service';
+import { FileService } from '@dspace/core/shared/file.service';
 import { HALEndpointService } from '@dspace/core/shared/hal-endpoint.service';
 import { SubmissionJsonPatchOperationsService } from '@dspace/core/submission/submission-json-patch-operations.service';
 import { HALEndpointServiceStub } from '@dspace/core/testing/hal-endpoint-service.stub';
@@ -29,7 +31,6 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
-import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { FormService } from '../../../../shared/form/form.service';
 import { getMockFormService } from '../../../../shared/form/testing/form-service.mock';
@@ -108,6 +109,8 @@ describe('SubmissionSectionUploadFileComponent', () => {
         { provide: SubmissionService, useClass: SubmissionServiceStub },
         { provide: SectionUploadService, useValue: getMockSectionUploadService() },
         { provide: ThemeService, useValue: getMockThemeService() },
+        { provide: FileService, useValue: { retrieveFileDownloadLink: jasmine.createSpy('retrieveFileDownloadLink').and.returnValue(of('https://test-url.com/file')) } },
+        { provide: HardRedirectService, useValue: { redirect: jasmine.createSpy('redirect') } },
         ChangeDetectorRef,
         NgbModal,
         SubmissionSectionUploadFileComponent,
@@ -121,7 +124,6 @@ describe('SubmissionSectionUploadFileComponent', () => {
         },
         remove: { imports: [
           SubmissionSectionUploadFileViewComponent,
-          ThemedFileDownloadLinkComponent,
         ] },
       })
       .compileComponents();
@@ -272,15 +274,13 @@ describe('SubmissionSectionUploadFileComponent', () => {
       expect(compAsAny.editBitstreamData).toHaveBeenCalled();
     });
 
-    it('should return a Bitstream with correct uuid and _links from fileData', () => {
+    it('should call downloadFile and open link in new tab', () => {
+      spyOn(window, 'open');
       comp.fileData = fileData;
 
-      const bitstream = comp.getBitstream();
+      comp.downloadFile();
 
-      expect(bitstream.uuid).toBe(fileData.uuid);
-      expect(bitstream._links.self.href).toBe(fileData.url);
-      expect(bitstream._links.content.href).toBe(fileData.url);
-      expect(bitstream._links.thumbnail.href).toBe('');
+      expect(window.open).toHaveBeenCalledWith('https://test-url.com/file', '_blank');
     });
 
   });
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index f1aa7be8b8f..ab7eccd5f33 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -11,7 +11,6 @@ import {
 import { SubmissionFormsModel } from '@dspace/core/config/models/config-submission-forms.model';
 import { JsonPatchOperationPathCombiner } from '@dspace/core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '@dspace/core/json-patch/builder/json-patch-operations-builder';
-import { Bitstream } from '@dspace/core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '@dspace/core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '@dspace/core/submission/submission-json-patch-operations.service';
 import {
@@ -29,10 +28,14 @@ import {
   Observable,
   Subscription,
 } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
 
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { FileService } from '../../../../core/shared/file.service';
 import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
-import { ThemedFileDownloadLinkComponent } from '../../../../shared/file-download-link/themed-file-download-link.component';
 import { FormService } from '../../../../shared/form/form.service';
 import { SubmissionService } from '../../../submission.service';
 import { SectionUploadService } from '../section-upload.service';
@@ -50,7 +53,6 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
     AsyncPipe,
     BtnDisabledDirective,
     SubmissionSectionUploadFileViewComponent,
-    ThemedFileDownloadLinkComponent,
     TranslateModule,
   ],
 })
@@ -203,6 +205,8 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
     private operationsService: SubmissionJsonPatchOperationsService,
     private submissionService: SubmissionService,
     private uploadService: SectionUploadService,
+    private fileService: FileService,
+    private hardRedirectService: HardRedirectService,
   ) {
     this.readMode = true;
   }
@@ -250,21 +254,11 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit,
   }
 
   /**
-   * Build a Bitstream object by the current file uuid
-   *
-   * @return Bitstream object
+   * Download the file using a short-lived token
    */
-  public getBitstream(): Bitstream {
-    return Object.assign(new Bitstream(), {
-      uuid: this.fileData.uuid,
-      _links: {
-        self: { href: this.fileData.url },
-        content: { href: this.fileData.url },
-        bundle: { href: '' },
-        format: { href: '' },
-        thumbnail: { href: this.fileData.thumbnail || '' },
-        accessStatus: { href: '' },
-      },
+  public downloadFile() {
+    this.fileService.retrieveFileDownloadLink(this.fileData.url).pipe(take(1)).subscribe((link) => {
+      window.open(link, '_blank');
     });
   }
 

From 873992baf79304aa405b579d33b512781a3df839 Mon Sep 17 00:00:00 2001
From: guillermo2519 <escalante.guillermo2519@gmail.com>
Date: Fri, 8 May 2026 08:45:33 -0600
Subject: [PATCH 3/3] Merge main and fix unused Bitstream import

---
 .../sections/upload/file/section-upload-file.component.ts        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index ab501e886d5..0284a0924c0 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -14,7 +14,6 @@ import { FeatureID } from '@dspace/core/data/feature-authorization/feature-id';
 import { ItemDataService } from '@dspace/core/data/item-data.service';
 import { JsonPatchOperationPathCombiner } from '@dspace/core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '@dspace/core/json-patch/builder/json-patch-operations-builder';
-import { Bitstream } from '@dspace/core/shared/bitstream.model';
 import { followLink } from '@dspace/core/shared/follow-link-config.model';
 import { HALEndpointService } from '@dspace/core/shared/hal-endpoint.service';
 import { Item } from '@dspace/core/shared/item.model';