From 5272360c77ce5fd70ee33f5e6779f438298a90d5 Mon Sep 17 00:00:00 2001
From: web <web@ppanel.dev>
Date: Wed, 3 Sep 2025 02:23:24 -0700
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20Update=20server=20list=20fe?=
 =?UTF-8?q?tching=20logic=20and=20adjust=20query=20parameters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/admin/app/dashboard/nodes/node-form.tsx | 8 +++++++-
 apps/admin/app/dashboard/nodes/page.tsx      | 4 ++--
 apps/admin/app/dashboard/servers/page.tsx    | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/admin/app/dashboard/nodes/node-form.tsx b/apps/admin/app/dashboard/nodes/node-form.tsx
index 726eb3e..866e9f0 100644
--- a/apps/admin/app/dashboard/nodes/node-form.tsx
+++ b/apps/admin/app/dashboard/nodes/node-form.tsx
@@ -94,7 +94,13 @@ export default function NodeForm(props: {
 
   const serverId = form.watch('server_id');
 
-  const { data } = useQuery({ queryKey: ['filterServerListAll'], queryFn: getServers });
+  const { data } = useQuery({
+    queryKey: ['filterServerListAll'],
+    queryFn: async () => {
+      const { data } = await filterServerList({ page: 1, size: 1000 });
+      return data?.data?.list || [];
+    },
+  });
   const servers: ServerRow[] = data as ServerRow[];
 
   const currentServer = useMemo(() => servers?.find((s) => s.id === serverId), [servers, serverId]);
diff --git a/apps/admin/app/dashboard/nodes/page.tsx b/apps/admin/app/dashboard/nodes/page.tsx
index 166d0fc..9e226e8 100644
--- a/apps/admin/app/dashboard/nodes/page.tsx
+++ b/apps/admin/app/dashboard/nodes/page.tsx
@@ -26,7 +26,7 @@ export default function NodesPage() {
   const [loading, setLoading] = useState(false);
 
   const { data: servers = [] } = useQuery({
-    queryKey: ['filterServerListAll', { page: 1, size: 1000 }],
+    queryKey: ['filterServerListAll'],
     queryFn: async () => {
       const { data } = await filterServerList({ page: 1, size: 1000 });
       return data?.data?.list || [];
@@ -103,7 +103,7 @@ export default function NodesPage() {
         },
 
         {
-          id: 'server_combined',
+          id: 'server_id',
           header: t('server'),
           cell: ({ row }) => (
             <div className='flex flex-wrap gap-2'>
diff --git a/apps/admin/app/dashboard/servers/page.tsx b/apps/admin/app/dashboard/servers/page.tsx
index b7c5cc3..83e4c04 100644
--- a/apps/admin/app/dashboard/servers/page.tsx
+++ b/apps/admin/app/dashboard/servers/page.tsx
@@ -114,7 +114,7 @@ export default function ServersPage() {
           title: t('pageTitle'),
           toolbar: (
             <div className='flex gap-2'>
-              {!hasMigrate && (
+              {hasMigrate && (
                 <Button variant='outline' onClick={handleMigrate} disabled={migrating}>
                   {migrating ? t('migrating') : t('migrate')}
                 </Button>