From a25ce4ae21d9c0d4caa28a1415e7e7b4e62f9ff1 Mon Sep 17 00:00:00 2001
From: adam <me@adamksmith.xyz>
Date: Sat, 7 Mar 2026 04:44:31 +0000
Subject: [PATCH] Add ZFS drive state (ONLINE/FAULTED/DEGRADED) to UI

---
 frontend/src/App.jsx | 30 +++++++++++++++++++++++-------
 models/schemas.py    |  2 ++
 routers/drives.py    |  1 +
 routers/overview.py  |  1 +
 services/zfs.py      |  2 ++
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 56bf2a0..1c08824 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -264,7 +264,7 @@ function TableView({ enclosure, onSelect, selectedSerial, t }) {
       <table style={{ width: "100%", borderCollapse: "separate", borderSpacing: "0 4px", fontSize: 13 }}>
         <thead>
           <tr style={{ textAlign: "left", color: t.textSecondary, fontSize: 11, textTransform: "uppercase", letterSpacing: 0.8 }}>
-            {["Slot", "Device", "Model", "Serial", "WWN", "FW", "Capacity", "Pool", "Vdev", "Temp", "Hours", "Health"].map((h) => (
+            {["Slot", "Device", "Model", "Serial", "WWN", "FW", "Capacity", "Pool", "Vdev", "ZFS State", "Temp", "Hours", "Health"].map((h) => (
               <th key={h} style={{ padding: "6px 10px", fontWeight: 600, borderBottom: `2px solid ${t.divider}` }}>{h}</th>
             ))}
           </tr>
@@ -314,6 +314,17 @@ function TableView({ enclosure, onSelect, selectedSerial, t }) {
                     <span style={{ fontSize: 11, color: t.textMuted, fontStyle: "italic" }}>{"\u2014"}</span>
                   )}
                 </td>
+                <td style={{ padding: "8px 10px" }}>
+                  {d.zfs_state ? (
+                    <span style={{
+                      fontSize: 11, fontWeight: 700,
+                      fontFamily: "'JetBrains Mono', monospace",
+                      color: d.zfs_state === "ONLINE" ? t.health.healthy.text : d.zfs_state === "DEGRADED" ? t.health.warning.text : d.zfs_state === "FAULTED" || d.zfs_state === "UNAVAIL" ? t.health.error.text : t.textSecondary,
+                    }}>{d.zfs_state}</span>
+                  ) : (
+                    <span style={{ fontSize: 11, color: t.textMuted, fontStyle: "italic" }}>{"\u2014"}</span>
+                  )}
+                </td>
                 <td style={{ padding: "8px 10px", fontWeight: 600, color: d.temperature_c >= 40 ? t.health.warning.text : t.text }}>{d.temperature_c != null ? `${d.temperature_c}\u00B0C` : "\u2014"}</td>
                 <td style={{ padding: "8px 10px", color: t.text }}>{formatHours(d.power_on_hours)}</td>
                 <td style={{ padding: "8px 10px", borderRadius: "0 6px 6px 0" }}><StatusPill status={healthStatus} t={t} /></td>
@@ -431,12 +442,17 @@ function DriveDetail({ slot, onClose, t }) {
                       / {d.zfs_vdev}
                     </span>
                   )}
-                  <span style={{
-                    fontSize: 10, fontWeight: 600, color: t.health.healthy.text, opacity: 0.7,
-                    background: t.health.healthy.border + "33", padding: "2px 6px", borderRadius: 4,
-                  }}>
-                    MEMBER
-                  </span>
+                  {d.zfs_state && (
+                    <span style={{
+                      fontSize: 11, fontWeight: 700,
+                      fontFamily: "'JetBrains Mono', monospace",
+                      color: d.zfs_state === "ONLINE" ? t.health.healthy.text : d.zfs_state === "DEGRADED" ? t.health.warning.text : t.health.error.text,
+                      background: (d.zfs_state === "ONLINE" ? t.health.healthy.border : d.zfs_state === "DEGRADED" ? t.health.warning.border : t.health.error.border) + "33",
+                      padding: "2px 8px", borderRadius: 4,
+                    }}>
+                      {d.zfs_state}
+                    </span>
+                  )}
                 </>
               ) : (
                 <>
diff --git a/models/schemas.py b/models/schemas.py
index 814a699..4928632 100644
--- a/models/schemas.py
+++ b/models/schemas.py
@@ -34,6 +34,7 @@ class DriveDetail(BaseModel):
     wear_leveling_percent: int | None = None
     zfs_pool: str | None = None
     zfs_vdev: str | None = None
+    zfs_state: str | None = None
     smart_attributes: list[dict] = []
 
 
@@ -53,6 +54,7 @@ class DriveHealthSummary(BaseModel):
     uncorrectable_errors: int | None = None
     zfs_pool: str | None = None
     zfs_vdev: str | None = None
+    zfs_state: str | None = None
     health_status: str = "healthy"
 
 
diff --git a/routers/drives.py b/routers/drives.py
index 08d77c5..24be49e 100644
--- a/routers/drives.py
+++ b/routers/drives.py
@@ -23,5 +23,6 @@ async def get_drive_detail(device: str):
     if zfs_info:
         data["zfs_pool"] = zfs_info["pool"]
         data["zfs_vdev"] = zfs_info["vdev"]
+        data["zfs_state"] = zfs_info.get("state")
 
     return DriveDetail(**data)
diff --git a/routers/overview.py b/routers/overview.py
index 54ed7fa..ef4debf 100644
--- a/routers/overview.py
+++ b/routers/overview.py
@@ -95,6 +95,7 @@ async def get_overview():
                     uncorrectable_errors=sd.get("uncorrectable_errors"),
                     zfs_pool=pool_map.get(sd["device"], {}).get("pool"),
                     zfs_vdev=pool_map.get(sd["device"], {}).get("vdev"),
+                    zfs_state=pool_map.get(sd["device"], {}).get("state"),
                     health_status=health_status,
                 )
             elif s["populated"]:
diff --git a/services/zfs.py b/services/zfs.py
index d758021..47d313a 100644
--- a/services/zfs.py
+++ b/services/zfs.py
@@ -71,9 +71,11 @@ async def get_zfs_pool_map() -> dict[str, dict]:
                 parts = stripped.split()
                 dev_path = parts[0]
                 try:
+                    dev_state = parts[1] if len(parts) > 1 else None
                     info = {
                         "pool": current_pool,
                         "vdev": current_vdev or current_pool,
+                        "state": dev_state,
                     }
                     # Resolve symlink and map the device
                     real = os.path.realpath(dev_path)