From a671ad79a1c858a50c7cc8142b2d6368416880ff Mon Sep 17 00:00:00 2001
From: ZacharyZcR <zacharyzcr1984@gmail.com>
Date: Thu, 9 Oct 2025 09:02:38 +0800
Subject: [PATCH] fix: widget deletion and layout persistence issues

---
 src/backend/database/routes/ssh.ts    |  2 ++
 src/types/index.ts                    |  2 ++
 src/ui/Desktop/Apps/Server/Server.tsx | 22 +++++++++++++++-------
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/backend/database/routes/ssh.ts b/src/backend/database/routes/ssh.ts
index 5f45ac74..7f223ee7 100644
--- a/src/backend/database/routes/ssh.ts
+++ b/src/backend/database/routes/ssh.ts
@@ -414,6 +414,7 @@ router.put(
       enableFileManager,
       defaultPath,
       tunnelConnections,
+      statsConfig,
     } = hostData;
     if (
       !isNonEmptyString(userId) ||
@@ -450,6 +451,7 @@ router.put(
         : null,
       enableFileManager: enableFileManager ? 1 : 0,
       defaultPath: defaultPath || null,
+      statsConfig: statsConfig || null,
     };
 
     if (effectiveAuthType === "password") {
diff --git a/src/types/index.ts b/src/types/index.ts
index e5532893..102d7f01 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -35,6 +35,7 @@ export interface SSHHost {
   enableFileManager: boolean;
   defaultPath: string;
   tunnelConnections: TunnelConnection[];
+  statsConfig?: string;
   createdAt: string;
   updatedAt: string;
 }
@@ -58,6 +59,7 @@ export interface SSHHostData {
   enableFileManager?: boolean;
   defaultPath?: string;
   tunnelConnections?: any[];
+  statsConfig?: string;
 }
 
 // ============================================================================
diff --git a/src/ui/Desktop/Apps/Server/Server.tsx b/src/ui/Desktop/Apps/Server/Server.tsx
index 421648e4..54cad5eb 100644
--- a/src/ui/Desktop/Apps/Server/Server.tsx
+++ b/src/ui/Desktop/Apps/Server/Server.tsx
@@ -110,7 +110,12 @@ export function Server({
     setHasUnsavedChanges(true);
   };
 
-  const handleDeleteWidget = (widgetId: string) => {
+  const handleDeleteWidget = (
+    widgetId: string,
+    e: React.MouseEvent<HTMLButtonElement>,
+  ) => {
+    e.stopPropagation();
+    e.preventDefault();
     setWidgets((prev) => prev.filter((w) => w.id !== widgetId));
     setHasUnsavedChanges(true);
   };
@@ -147,8 +152,9 @@ export function Server({
           <div className="h-full w-full space-y-3 p-4 rounded-lg bg-dark-bg/50 border border-dark-border/50 hover:bg-dark-bg/70 transition-colors duration-200">
             {isEditMode && (
               <button
-                onClick={() => handleDeleteWidget(widget.id)}
-                className="absolute top-2 right-2 z-10 w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center"
+                onClick={(e) => handleDeleteWidget(widget.id, e)}
+                className="absolute top-2 right-2 z-[9999] w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center cursor-pointer"
+                type="button"
               >
                 <X className="h-4 w-4" />
               </button>
@@ -198,8 +204,9 @@ export function Server({
           <div className="h-full w-full space-y-3 p-4 rounded-lg bg-dark-bg/50 border border-dark-border/50 hover:bg-dark-bg/70 transition-colors duration-200">
             {isEditMode && (
               <button
-                onClick={() => handleDeleteWidget(widget.id)}
-                className="absolute top-2 right-2 z-10 w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center"
+                onClick={(e) => handleDeleteWidget(widget.id, e)}
+                className="absolute top-2 right-2 z-[9999] w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center cursor-pointer"
+                type="button"
               >
                 <X className="h-4 w-4" />
               </button>
@@ -260,8 +267,9 @@ export function Server({
           <div className="h-full w-full space-y-3 p-4 rounded-lg bg-dark-bg/50 border border-dark-border/50 hover:bg-dark-bg/70 transition-colors duration-200">
             {isEditMode && (
               <button
-                onClick={() => handleDeleteWidget(widget.id)}
-                className="absolute top-2 right-2 z-10 w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center"
+                onClick={(e) => handleDeleteWidget(widget.id, e)}
+                className="absolute top-2 right-2 z-[9999] w-6 h-6 bg-red-500/80 hover:bg-red-500 text-white rounded-full flex items-center justify-center cursor-pointer"
+                type="button"
               >
                 <X className="h-4 w-4" />
               </button>