Persist device details by hostname and enhance UI

This commit is contained in:
2025-08-13 00:37:43 -06:00
parent f1fe831911
commit 10c024ddd7
6 changed files with 936 additions and 4 deletions

View File

@@ -29,6 +29,7 @@ import DeviceList from "./Device_List";
import ScriptList from "./Script_List";
import ScheduledJobsList from "./Scheduled_Jobs_List";
import Login from "./Login.jsx";
import DeviceDetails from "./Device_Details";
import { io } from "socket.io-client";
@@ -77,6 +78,7 @@ export default function App() {
const [tabs, setTabs] = useState([{ id: "flow_1", tab_name: "Flow 1", nodes: [], edges: [] }]);
const [activeTabId, setActiveTabId] = useState("flow_1");
const [currentPage, setCurrentPage] = useState("devices");
const [selectedDevice, setSelectedDevice] = useState(null);
const [aboutAnchorEl, setAboutAnchorEl] = useState(null);
const [creditsDialogOpen, setCreditsDialogOpen] = useState(false);
@@ -288,7 +290,25 @@ export default function App() {
const renderMainContent = () => {
switch (currentPage) {
case "devices":
return <DeviceList />;
return (
<DeviceList
onSelectDevice={(d) => {
setSelectedDevice(d);
setCurrentPage("device_details");
}}
/>
);
case "device_details":
return (
<DeviceDetails
device={selectedDevice}
onBack={() => {
setCurrentPage("devices");
setSelectedDevice(null);
}}
/>
);
case "jobs":
return <ScheduledJobsList />;

View File

@@ -0,0 +1,402 @@
////////// PROJECT FILE SEPARATION LINE ////////// CODE AFTER THIS LINE ARE FROM: <ProjectRoot>/Data/WebUI/src/Device_Details.js
import React, { useState, useEffect, useMemo } from "react";
import {
Paper,
Box,
Tabs,
Tab,
Typography,
Table,
TableHead,
TableRow,
TableCell,
TableBody,
Button,
LinearProgress,
TableSortLabel,
TextField
} from "@mui/material";
export default function DeviceDetails({ device, onBack }) {
const [tab, setTab] = useState(0);
const [agent, setAgent] = useState(device || {});
const [details, setDetails] = useState({});
const [softwareOrderBy, setSoftwareOrderBy] = useState("name");
const [softwareOrder, setSoftwareOrder] = useState("asc");
const [softwareSearch, setSoftwareSearch] = useState("");
const [description, setDescription] = useState("");
useEffect(() => {
if (!device || !device.hostname) return;
const load = async () => {
try {
const [agentsRes, detailsRes] = await Promise.all([
fetch("/api/agents"),
fetch(`/api/device/details/${device.hostname}`)
]);
const agentsData = await agentsRes.json();
if (agentsData && agentsData[device.id]) {
setAgent({ id: device.id, ...agentsData[device.id] });
}
const detailData = await detailsRes.json();
setDetails(detailData || {});
setDescription(detailData?.summary?.description || "");
} catch (e) {
console.warn("Failed to load device info", e);
}
};
load();
}, [device]);
const saveDescription = async () => {
if (!details.summary?.hostname) return;
try {
await fetch(`/api/device/description/${details.summary.hostname}`, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ description })
});
setDetails((d) => ({
...d,
summary: { ...(d.summary || {}), description }
}));
} catch (e) {
console.warn("Failed to save description", e);
}
};
const formatDateTime = (str) => {
if (!str) return "unknown";
try {
const [datePart, timePart] = str.split(" ");
const [y, m, d] = datePart.split("-").map(Number);
let [hh, mm, ss] = timePart.split(":").map(Number);
const ampm = hh >= 12 ? "PM" : "AM";
hh = hh % 12 || 12;
return `${m.toString().padStart(2, "0")}/${d.toString().padStart(2, "0")}/${y} - ${hh}:${mm
.toString()
.padStart(2, "0")}${ampm}`;
} catch {
return str;
}
};
const formatMac = (mac) => (mac ? mac.replace(/-/g, ":").toUpperCase() : "unknown");
const formatBytes = (val) => {
if (val === undefined || val === null || val === "unknown") return "unknown";
let num = Number(val);
const units = ["B", "KB", "MB", "GB", "TB"];
let i = 0;
while (num >= 1024 && i < units.length - 1) {
num /= 1024;
i++;
}
return `${num.toFixed(1)} ${units[i]}`;
};
const handleSoftwareSort = (col) => {
if (softwareOrderBy === col) {
setSoftwareOrder(softwareOrder === "asc" ? "desc" : "asc");
} else {
setSoftwareOrderBy(col);
setSoftwareOrder("asc");
}
};
const softwareRows = useMemo(() => {
const rows = details.software || [];
const filtered = rows.filter((s) =>
s.name.toLowerCase().includes(softwareSearch.toLowerCase())
);
const dir = softwareOrder === "asc" ? 1 : -1;
return [...filtered].sort((a, b) => {
const A = a[softwareOrderBy] || "";
const B = b[softwareOrderBy] || "";
return String(A).localeCompare(String(B)) * dir;
});
}, [details.software, softwareSearch, softwareOrderBy, softwareOrder]);
const summary = details.summary || {};
const summaryItems = [
{ label: "Device Name", value: summary.hostname || agent.hostname || device?.hostname || "unknown" },
{ label: "Operating System", value: summary.operating_system || agent.agent_operating_system || "unknown" },
{ label: "Last User", value: summary.last_user || "unknown" },
{ label: "Internal IP", value: summary.internal_ip || "unknown" },
{ label: "External IP", value: summary.external_ip || "unknown" },
{ label: "Last Reboot", value: summary.last_reboot ? formatDateTime(summary.last_reboot) : "unknown" },
{ label: "Created", value: summary.created ? formatDateTime(summary.created) : "unknown" }
];
const renderSummary = () => (
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableBody>
<TableRow>
<TableCell sx={{ fontWeight: 500 }}>Description</TableCell>
<TableCell>
<TextField
size="small"
value={description}
onChange={(e) => setDescription(e.target.value)}
onBlur={saveDescription}
placeholder="Enter description"
sx={{
input: { color: "#fff" },
"& .MuiOutlinedInput-root": {
"& fieldset": { borderColor: "#555" },
"&:hover fieldset": { borderColor: "#888" }
}
}}
/>
</TableCell>
</TableRow>
{summaryItems.map((item) => (
<TableRow key={item.label}>
<TableCell sx={{ fontWeight: 500 }}>{item.label}</TableCell>
<TableCell>{item.value}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Box>
);
const placeholderTable = (headers) => (
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableHead>
<TableRow>
{headers.map((h) => (
<TableCell key={h}>{h}</TableCell>
))}
</TableRow>
</TableHead>
<TableBody>
<TableRow>
<TableCell colSpan={headers.length} sx={{ color: "#888" }}>
No data available.
</TableCell>
</TableRow>
</TableBody>
</Table>
</Box>
);
const renderSoftware = () => {
if (!softwareRows.length)
return placeholderTable(["Software Name", "Version", "Action"]);
return (
<Box>
<Box sx={{ mb: 1 }}>
<TextField
size="small"
placeholder="Search software..."
value={softwareSearch}
onChange={(e) => setSoftwareSearch(e.target.value)}
sx={{
input: { color: "#fff" },
"& .MuiOutlinedInput-root": {
"& fieldset": { borderColor: "#555" },
"&:hover fieldset": { borderColor: "#888" }
}
}}
/>
</Box>
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableHead>
<TableRow>
<TableCell sortDirection={softwareOrderBy === "name" ? softwareOrder : false}>
<TableSortLabel
active={softwareOrderBy === "name"}
direction={softwareOrderBy === "name" ? softwareOrder : "asc"}
onClick={() => handleSoftwareSort("name")}
>
Software Name
</TableSortLabel>
</TableCell>
<TableCell sortDirection={softwareOrderBy === "version" ? softwareOrder : false}>
<TableSortLabel
active={softwareOrderBy === "version"}
direction={softwareOrderBy === "version" ? softwareOrder : "asc"}
onClick={() => handleSoftwareSort("version")}
>
Version
</TableSortLabel>
</TableCell>
<TableCell>Action</TableCell>
</TableRow>
</TableHead>
<TableBody>
{softwareRows.map((s, i) => (
<TableRow key={`${s.name}-${i}`}>
<TableCell>{s.name}</TableCell>
<TableCell>{s.version}</TableCell>
<TableCell></TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Box>
</Box>
);
};
const renderMemory = () => {
const rows = details.memory || [];
if (!rows.length) return placeholderTable(["Slot", "Speed", "Serial Number", "Capacity"]);
return (
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Slot</TableCell>
<TableCell>Speed</TableCell>
<TableCell>Serial Number</TableCell>
<TableCell>Capacity</TableCell>
</TableRow>
</TableHead>
<TableBody>
{rows.map((m, i) => (
<TableRow key={`${m.slot}-${i}`}>
<TableCell>{m.slot}</TableCell>
<TableCell>{m.speed}</TableCell>
<TableCell>{m.serial}</TableCell>
<TableCell>{formatBytes(m.capacity)}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Box>
);
};
const renderStorage = () => {
const rows = (details.storage || []).map((d) => ({
drive: d.drive,
disk_type: d.disk_type,
usage: d.usage !== undefined ? Number(d.usage) : undefined,
total: d.total !== undefined ? Number(d.total) : undefined,
free: d.free !== undefined ? Number(d.free) : undefined,
}));
if (!rows.length)
return placeholderTable(["Drive Letter", "Disk Type", "Usage", "Total Size", "Free %"]);
return (
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Drive Letter</TableCell>
<TableCell>Disk Type</TableCell>
<TableCell>Usage</TableCell>
<TableCell>Total Size</TableCell>
<TableCell>Free %</TableCell>
</TableRow>
</TableHead>
<TableBody>
{rows.map((d, i) => (
<TableRow key={`${d.drive}-${i}`}>
<TableCell>{d.drive}</TableCell>
<TableCell>{d.disk_type}</TableCell>
<TableCell>
<Box sx={{ display: "flex", alignItems: "center" }}>
<Box sx={{ flexGrow: 1, mr: 1 }}>
<LinearProgress
variant="determinate"
value={d.usage ?? 0}
sx={{
height: 10,
bgcolor: "#333",
"& .MuiLinearProgress-bar": { bgcolor: "#58a6ff" }
}}
/>
</Box>
<Typography variant="body2">
{d.usage !== undefined && !Number.isNaN(d.usage)
? `${d.usage.toFixed(1)}%`
: "unknown"}
</Typography>
</Box>
</TableCell>
<TableCell>
{d.total !== undefined && !Number.isNaN(d.total)
? formatBytes(d.total)
: "unknown"}
</TableCell>
<TableCell>
{d.free !== undefined && !Number.isNaN(d.free)
? `${d.free.toFixed(1)}%`
: "unknown"}
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Box>
);
};
const renderNetwork = () => {
const rows = details.network || [];
if (!rows.length) return placeholderTable(["Adapter", "IP Address", "MAC Address"]);
return (
<Box sx={{ maxHeight: 400, overflowY: "auto" }}>
<Table size="small">
<TableHead>
<TableRow>
<TableCell>Adapter</TableCell>
<TableCell>IP Address</TableCell>
<TableCell>MAC Address</TableCell>
</TableRow>
</TableHead>
<TableBody>
{rows.map((n, i) => (
<TableRow key={`${n.adapter}-${i}`}>
<TableCell>{n.adapter}</TableCell>
<TableCell>{(n.ips || []).join(", ")}</TableCell>
<TableCell>{formatMac(n.mac)}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</Box>
);
};
const tabs = [
{ label: "Summary", content: renderSummary() },
{ label: "Software", content: renderSoftware() },
{ label: "Memory", content: renderMemory() },
{ label: "Storage", content: renderStorage() },
{ label: "Network", content: renderNetwork() }
];
return (
<Paper sx={{ m: 2, p: 2, bgcolor: "#1e1e1e" }} elevation={2}>
<Box sx={{ mb: 2, display: "flex", alignItems: "center" }}>
{onBack && (
<Button variant="outlined" size="small" onClick={onBack} sx={{ mr: 2 }}>
Back
</Button>
)}
<Typography variant="h6" sx={{ color: "#58a6ff" }}>
{agent.hostname || "Device Details"}
</Typography>
</Box>
<Tabs
value={tab}
onChange={(e, v) => setTab(v)}
sx={{ borderBottom: 1, borderColor: "#333" }}
>
{tabs.map((t) => (
<Tab key={t.label} label={t.label} />
))}
</Tabs>
<Box sx={{ mt: 2 }}>{tabs[tab].content}</Box>
</Paper>
);
}

View File

@@ -35,7 +35,7 @@ function statusFromHeartbeat(tsSec, offlineAfter = 15) {
return now - tsSec <= offlineAfter ? "Online" : "Offline";
}
export default function DeviceList() {
export default function DeviceList({ onSelectDevice }) {
const [rows, setRows] = useState([]);
const [orderBy, setOrderBy] = useState("status");
const [order, setOrder] = useState("desc");
@@ -165,7 +165,12 @@ export default function DeviceList() {
</TableHead>
<TableBody>
{sorted.map((r, i) => (
<TableRow key={r.id || i} hover>
<TableRow
key={r.id || i}
hover
onClick={() => onSelectDevice && onSelectDevice(r)}
sx={{ cursor: onSelectDevice ? "pointer" : "default" }}
>
<TableCell>
<span
style={{

View File

@@ -14,6 +14,7 @@ import os # To Read Production ReactJS Server Folder
import json # For reading workflow JSON files
import shutil # For moving workflow files and folders
from typing import List, Dict
import sqlite3
# Borealis Python API Endpoints
from Python_API_Endpoints.ocr_engines import run_ocr_on_base64
@@ -380,6 +381,23 @@ registered_agents: Dict[str, Dict] = {}
agent_configurations: Dict[str, Dict] = {}
latest_images: Dict[str, Dict] = {}
# Device database initialization
DB_PATH = os.path.abspath(
os.path.join(os.path.dirname(__file__), "..", "..", "Databases", "devices.db")
)
os.makedirs(os.path.dirname(DB_PATH), exist_ok=True)
def init_db():
conn = sqlite3.connect(DB_PATH)
cur = conn.cursor()
cur.execute(
"CREATE TABLE IF NOT EXISTS device_details (hostname TEXT PRIMARY KEY, description TEXT, details TEXT)"
)
conn.commit()
conn.close()
init_db()
@app.route("/api/agents")
def get_agents():
"""
@@ -388,6 +406,79 @@ def get_agents():
return jsonify(registered_agents)
@app.route("/api/agent/details", methods=["POST"])
def save_agent_details():
data = request.get_json(silent=True) or {}
hostname = data.get("hostname")
details = data.get("details")
if not hostname and isinstance(details, dict):
hostname = details.get("summary", {}).get("hostname")
if not hostname or not isinstance(details, dict):
return jsonify({"error": "invalid payload"}), 400
try:
conn = sqlite3.connect(DB_PATH)
cur = conn.cursor()
cur.execute(
"SELECT description FROM device_details WHERE hostname = ?",
(hostname,),
)
row = cur.fetchone()
description = row[0] if row else ""
cur.execute(
"REPLACE INTO device_details (hostname, description, details) VALUES (?, ?, ?)",
(hostname, description, json.dumps(details)),
)
conn.commit()
conn.close()
return jsonify({"status": "ok"})
except Exception as e:
return jsonify({"error": str(e)}), 500
@app.route("/api/device/details/<hostname>", methods=["GET"])
def get_device_details(hostname: str):
try:
conn = sqlite3.connect(DB_PATH)
cur = conn.cursor()
cur.execute(
"SELECT details, description FROM device_details WHERE hostname = ?",
(hostname,),
)
row = cur.fetchone()
conn.close()
if row:
try:
details = json.loads(row[0])
except Exception:
details = {}
description = row[1] if len(row) > 1 else ""
if description:
details.setdefault("summary", {})["description"] = description
return jsonify(details)
except Exception:
pass
return jsonify({})
@app.route("/api/device/description/<hostname>", methods=["POST"])
def set_device_description(hostname: str):
data = request.get_json(silent=True) or {}
description = (data.get("description") or "").strip()
try:
conn = sqlite3.connect(DB_PATH)
cur = conn.cursor()
cur.execute(
"INSERT INTO device_details(hostname, description, details) VALUES (?, ?, COALESCE((SELECT details FROM device_details WHERE hostname = ?), '{}')) "
"ON CONFLICT(hostname) DO UPDATE SET description=excluded.description",
(hostname, description, hostname),
)
conn.commit()
conn.close()
return jsonify({"status": "ok"})
except Exception as e:
return jsonify({"error": str(e)}), 500
@app.route("/api/agent/<agent_id>", methods=["DELETE"])
def delete_agent(agent_id: str):
"""Remove an agent from the in-memory registry."""