From 98da7b1476934c00a9b954ae5167c1c8cad74164 Mon Sep 17 00:00:00 2001
From: ppanel-web <web@ppanel.dev>
Date: Thu, 12 Feb 2026 23:03:08 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20node=20sort=20persistence?=
 =?UTF-8?q?=20on=20drag=20reorder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/src/sections/nodes/index.tsx | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/apps/admin/src/sections/nodes/index.tsx b/apps/admin/src/sections/nodes/index.tsx
index 788a915..f87dbb0 100644
--- a/apps/admin/src/sections/nodes/index.tsx
+++ b/apps/admin/src/sections/nodes/index.tsx
@@ -226,6 +226,9 @@ export default function Nodes() {
         ),
       }}
       onSort={async (source, target, items) => {
+        // NOTE: `items` is the current page's items from ProTable.
+        // We should avoid mutating it in-place, and we should persist the sort
+        // changes reliably (await the API call).
         const sourceIndex = items.findIndex(
           (item) => String(item.id) === source
         );
@@ -233,23 +236,31 @@ export default function Nodes() {
           (item) => String(item.id) === target
         );
 
+        if (sourceIndex === -1 || targetIndex === -1) return items;
+
+        const prevSortById = new Map(items.map((it) => [it.id, it.sort]));
         const originalSorts = items.map((item) => item.sort);
 
-        const [movedItem] = items.splice(sourceIndex, 1);
-        items.splice(targetIndex, 0, movedItem!);
+        const next = items.slice();
+        const [movedItem] = next.splice(sourceIndex, 1);
+        next.splice(targetIndex, 0, movedItem!);
 
-        const updatedItems = items.map((item, index) => {
+        // Keep the existing `sort` values bound to positions (so reordering swaps
+        // sort values instead of inventing new ones).
+        const updatedItems = next.map((item, index) => {
           const originalSort = originalSorts[index];
           const newSort = originalSort !== undefined ? originalSort : item.sort;
           return { ...item, sort: newSort };
         });
 
         const changedItems = updatedItems.filter(
-          (item, index) => item.sort !== items[index]?.sort
+          (item) => item.sort !== prevSortById.get(item.id)
         );
 
         if (changedItems.length > 0) {
-          resetSortWithNode({
+          await resetSortWithNode({
+            // Send all changed rows (within the current page) so backend can
+            // persist the new ordering.
             sort: changedItems.map((item) => ({
               id: item.id,
               sort: item.sort,
@@ -257,6 +268,7 @@ export default function Nodes() {
           });
           toast.success(t("sorted_success", "Sorted successfully"));
         }
+
         return updatedItems;
       }}
       params={[{ key: "search" }]}