From 8405f66e386559eb26a1affe5ed31575ea0a9f0c Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 9 Jun 2026 07:03:44 -0700
Subject: [PATCH] Fix (beta): fix re-ordering in merge dialog (#12967)

---
 .../merge-confirm-dialog.component.html                     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
index 90f555890..ab0951d54 100644
--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.html
@@ -9,8 +9,11 @@
         <label class="form-label" for="metadataDocumentID" i18n>Documents:</label>
         <ul class="list-group"
             cdkDropList
+            [cdkDropListData]="documentIDs"
             (cdkDropListDropped)="onDrop($event)">
-            @for (document of documents; track document.id) {
+            @for (documentID of documentIDs; track documentID) {
+              @let document = getDocument(documentID);
+              @if (document) {
                 <li class="list-group-item d-flex align-items-center" cdkDrag>
                     <i-bs name="grip-vertical" class="me-2"></i-bs>
                     <div class="d-flex flex-column">
@@ -27,6 +30,7 @@
                         </small>
                     </div>
                 </li>
+              }
             }
         </ul>
         </div>