fix sorting and gone

Author: sawka

frontend/app/view/processviewer/processviewer.tsx

@@ -598,6 +598,26 @@ const ProcessRow = React.memo(function ProcessRow({
     const gridTemplate = getGridTemplate(platform);
     const showStatus = platform !== "windows" && platform !== "darwin";
     const showThreads = platform !== "windows";
+    if (proc.gone) {
+        return (
+            <div
+                className={`grid w-full text-xs transition-colors cursor-pointer ${selected ? "bg-accentbg" : "hover:bg-white/5"}`}
+                style={{ gridTemplateColumns: gridTemplate, height: RowHeight }}
+                onClick={() => onSelect(proc.pid)}
+                onContextMenu={(e) => onContextMenu(proc.pid, e)}
+            >
+                <div className="px-2 flex items-center truncate justify-end text-secondary font-mono text-[11px]">
+                    {proc.pid}
+                </div>
+                <div className="px-2 flex items-center truncate text-muted italic">(gone)</div>
+                {showStatus && <div className="px-2 flex items-center truncate" />}
+                <div className="px-2 flex items-center truncate" />
+                {showThreads && <div className="px-2 flex items-center truncate" />}
+                <div className="px-2 flex items-center truncate" />
+                <div className="px-2 flex items-center truncate" />
+            </div>
+        );
+    }
     return (
         <div
             className={`grid w-full text-xs transition-colors cursor-pointer ${selected ? "bg-accentbg" : "hover:bg-white/5"}`}

pkg/wshrpc/wshremote/processviewer.go

@@ -396,13 +396,12 @@ func sortProcesses(processes []wshrpc.ProcessInfo, sortBy string, sortDesc bool)
 		sort.Slice(processes, func(i, j int) bool {
 			ci := processes[i].Cpu
 			cj := processes[j].Cpu
-			if ci < 0 {
-				ci = 0
+			iNull := ci < 0
+			jNull := cj < 0
+			if iNull != jNull {
+				return !iNull
 			}
-			if cj < 0 {
-				cj = 0
-			}
-			if ci != cj {
+			if !iNull && ci != cj {
 				if sortDesc {
 					return ci > cj
 				}
@@ -412,11 +411,18 @@ func sortProcesses(processes []wshrpc.ProcessInfo, sortBy string, sortDesc bool)
 		})
 	case "mem":
 		sort.Slice(processes, func(i, j int) bool {
-			if processes[i].Mem != processes[j].Mem {
+			mi := processes[i].Mem
+			mj := processes[j].Mem
+			iNull := mi < 0
+			jNull := mj < 0
+			if iNull != jNull {
+				return !iNull
+			}
+			if !iNull && mi != mj {
 				if sortDesc {
-					return processes[i].Mem > processes[j].Mem
+					return mi > mj
 				}
-				return processes[i].Mem < processes[j].Mem
+				return mi < mj
 			}
 			return processes[i].Pid < processes[j].Pid
 		})
@@ -452,11 +458,18 @@ func sortProcesses(processes []wshrpc.ProcessInfo, sortBy string, sortDesc bool)
 		})
 	case "threads":
 		sort.Slice(processes, func(i, j int) bool {
-			if processes[i].NumThreads != processes[j].NumThreads {
+			ti := processes[i].NumThreads
+			tj := processes[j].NumThreads
+			iNull := ti < 0
+			jNull := tj < 0
+			if iNull != jNull {
+				return !iNull
+			}
+			if !iNull && ti != tj {
 				if sortDesc {
-					return processes[i].NumThreads > processes[j].NumThreads
+					return ti > tj
 				}
-				return processes[i].NumThreads < processes[j].NumThreads
+				return ti < tj
 			}
 			return processes[i].Pid < processes[j].Pid
 		})