From c3696ff723f4b62a02eb7be55a40af60e4dc3497 Mon Sep 17 00:00:00 2001
From: amadulhaxxani <hassan@ufal.mff.cuni.cz>
Date: Tue, 16 Jun 2026 16:20:50 +0200
Subject: [PATCH 1/3] fix(bitstream): restore item UUID in edit redirect

fix(bitstream): restore item UUID in edit redirect
---
 .../edit-bitstream-page.component.ts            | 17 +++++++++++++++++
 .../item-edit-bitstream-bundle.component.html   |  4 +++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index c3872fd9767..85edbdf3db7 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -742,6 +742,23 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * otherwise retrieve the item ID based on the owning bundle's link
    */
   navigateToItemEditBitstreams() {
+    if (hasValue(this.itemId)) {
+      this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
+      return;
+    }
+    if (hasValue(this.bundle) && hasValue(this.bundle.item)) {
+      this.bundle.item.pipe(
+        getFirstSucceededRemoteDataPayload(),
+        take(1),
+      ).subscribe((item: Item) => {
+        this.itemId = item.uuid;
+        if (!hasValue(this.entityType)) {
+          this.entityType = item.firstMetadataValue('dspace.entity.type');
+        }
+        this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
+      });
+      return;
+    }
     this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
   }
 
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 947d501dfa0..f41ebcfb16a 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
@@ -112,7 +112,9 @@
                      [attr.data-test]="'download-button' | dsBrowserOnly">
                     <i class="fas fa-download fa-fw"></i>
                   </a>
-                  <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                  <button [routerLink]="['/bitstreams/', entry.id, 'edit']"
+                          [queryParams]="{ itemId: item.uuid, entityType: item.firstMetadataValue('dspace.entity.type') }"
+                          class="btn btn-outline-primary btn-sm"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
                     <i class="fas fa-edit fa-fw"></i>

From 1c5fe3e1946ae38f6e645ae13d520d47bd8c5bd1 Mon Sep 17 00:00:00 2001
From: amadulhaxxani <hassan@ufal.mff.cuni.cz>
Date: Thu, 18 Jun 2026 13:19:07 +0200
Subject: [PATCH 2/3] fix(bitstream): improve fallback navigation and error
 handling

fix(bitstream): improve fallback navigation and error handling
---
 .../edit-bitstream-page.component.spec.ts     | 13 ++++++++++
 .../edit-bitstream-page.component.ts          | 25 ++++++++++++-------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index c81926d83d9..542124b2b63 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -414,6 +414,19 @@ describe('EditBitstreamPageComponent', () => {
         comp.navigateToItemEditBitstreams();
         expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
       });
+
+      it('should resolve itemId from bundle.item when query param is missing', () => {
+        const mockItem = new Item();
+        mockItem.uuid = 'resolved-uuid-456';
+        const mockBundle = {
+          item: createSuccessfulRemoteDataObject$(mockItem)
+        };
+        (comp as any).bundle = mockBundle;
+        comp.itemId = undefined;
+        comp.navigateToItemEditBitstreams();
+        fixture.detectChanges();
+        expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'resolved-uuid-456'), 'bitstreams']);
+      });
     });
   });
 
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 85edbdf3db7..1f2564c065c 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -742,24 +742,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * otherwise retrieve the item ID based on the owning bundle's link
    */
   navigateToItemEditBitstreams() {
+    const navigate = () => this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
+
     if (hasValue(this.itemId)) {
-      this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
+      navigate();
       return;
     }
+
     if (hasValue(this.bundle) && hasValue(this.bundle.item)) {
       this.bundle.item.pipe(
-        getFirstSucceededRemoteDataPayload(),
-        take(1),
-      ).subscribe((item: Item) => {
-        this.itemId = item.uuid;
-        if (!hasValue(this.entityType)) {
-          this.entityType = item.firstMetadataValue('dspace.entity.type');
+        getFirstCompletedRemoteData(),
+      ).subscribe((itemRd: RemoteData<Item>) => {
+        if (itemRd.hasSucceeded && hasValue(itemRd.payload)) {
+          this.itemId = itemRd.payload.uuid;
+          if (!hasValue(this.entityType)) {
+            this.entityType = itemRd.payload.firstMetadataValue('dspace.entity.type');
+          }
+          navigate();
+        } else {
+          this.location.back();
         }
-        this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
       });
       return;
     }
-    this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
+
+    this.location.back();
   }
 
   /**

From 3fff66ed4d3cff30d6958e9838b3fd6a5a2e1d69 Mon Sep 17 00:00:00 2001
From: Claude Code <ko_ok@centrum.cz>
Date: Fri, 19 Jun 2026 13:02:52 +0000
Subject: [PATCH 3/3] proper cleanup on destroy

---
 .../edit-bitstream-page.component.ts          | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 1f2564c065c..78176ca675a 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -750,19 +750,21 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     }
 
     if (hasValue(this.bundle) && hasValue(this.bundle.item)) {
-      this.bundle.item.pipe(
-        getFirstCompletedRemoteData(),
-      ).subscribe((itemRd: RemoteData<Item>) => {
-        if (itemRd.hasSucceeded && hasValue(itemRd.payload)) {
-          this.itemId = itemRd.payload.uuid;
-          if (!hasValue(this.entityType)) {
-            this.entityType = itemRd.payload.firstMetadataValue('dspace.entity.type');
+      this.subs.push(
+        this.bundle.item.pipe(
+          getFirstCompletedRemoteData(),
+        ).subscribe((itemRd: RemoteData<Item>) => {
+          if (itemRd.hasSucceeded && hasValue(itemRd.payload)) {
+            this.itemId = itemRd.payload.uuid;
+            if (!hasValue(this.entityType)) {
+              this.entityType = itemRd.payload.firstMetadataValue('dspace.entity.type');
+            }
+            navigate();
+          } else {
+            this.location.back();
           }
-          navigate();
-        } else {
-          this.location.back();
-        }
-      });
+        }),
+      );
       return;
     }