Pouzor
05ef746f22
Cluster edges created via the pending -> approve path rendered on the top
handle instead of left/right, because the edge and its endpoints lost their
handle information on the way to the canvas.
- Approve resolver (scan.py) now returns each edge's type + source/target
handle. Handle IDs are the bare slot-0 side names ('right'/'left'), the
canonical stored form React Flow resolves to the correct side; a '-t' target
id fails to resolve and falls back to the top handle.
- Frontend injectAutoEdges no longer hardcodes iot/bottom/top-t. It injects
each edge with its real type + handles and bumps the referenced nodes'
left/right handle counts (which default to 0) so the cluster endpoints exist.
Logic extracted to a pure, tested util (applyAutoEdges).
- clusterEdges direct-import path uses the bare 'left' target to match.
Tests: new autoEdges unit tests; updated backend handle assertions.
ha-relevant: maybe
825 lines
34 KiB
TypeScript
825 lines
34 KiB
TypeScript
import { useState, useEffect, useCallback, useRef, useMemo } from 'react'
|
|
import {
|
|
Globe, Router, Server, Layers, Box, Container, HardDrive, Cpu, Wifi, Circle, Network,
|
|
Search, RefreshCw, X, CheckCircle2, EyeOff, Trash2, Loader2, ServerCog,
|
|
} from 'lucide-react'
|
|
import { Dialog, DialogClose, DialogContent, DialogHeader, DialogTitle } from '@/components/ui/dialog'
|
|
import { scanApi } from '@/api/client'
|
|
import { useCanvasStore } from '@/stores/canvasStore'
|
|
import { useDesignStore } from '@/stores/designStore'
|
|
import { useThemeStore } from '@/stores/themeStore'
|
|
import { resolveNodeColors } from '@/utils/nodeColors'
|
|
import { toast } from 'sonner'
|
|
import { PendingDeviceModal, type PendingDevice } from '@/components/modals/PendingDeviceModal'
|
|
import type { NodeType, ServiceInfo } from '@/types'
|
|
import { applyAutoEdges, type AutoEdge } from '@/utils/autoEdges'
|
|
import { buildZigbeeProperties, isZigbeeType } from '@/utils/zigbeeProperties'
|
|
import { buildZwaveProperties, isZwaveType } from '@/utils/zwaveProperties'
|
|
import { buildMacProperty } from '@/utils/macProperty'
|
|
import { formatRelative, formatTimestamp } from '@/utils/timeFormat'
|
|
import { getCenteredPosition } from '@/utils/viewportCenter'
|
|
|
|
interface PendingDevicesModalProps {
|
|
open: boolean
|
|
onClose: () => void
|
|
highlightId?: string
|
|
initialStatus?: 'pending' | 'hidden'
|
|
}
|
|
|
|
const PORT_COLORS: Record<number, string> = {
|
|
22: '#a855f7', // SSH purple
|
|
80: '#00d4ff', // HTTP cyan
|
|
443: '#39d353', // HTTPS green
|
|
53: '#e3b341', // DNS amber
|
|
3306: '#a855f7', // MySQL
|
|
5432: '#a855f7', // Postgres
|
|
6379: '#f85149', // Redis
|
|
9090: '#e3b341', // Prometheus
|
|
3000: '#00d4ff', // Grafana/dev
|
|
8080: '#00d4ff',
|
|
8443: '#39d353',
|
|
}
|
|
|
|
const CATEGORY_COLORS: Record<string, string> = {
|
|
hypervisor: '#ff6e00',
|
|
nas: '#39d353',
|
|
automation: '#a855f7',
|
|
containers: '#00d4ff',
|
|
network: '#39d353',
|
|
security: '#f85149',
|
|
monitoring: '#e3b341',
|
|
database: '#a855f7',
|
|
web: '#00d4ff',
|
|
media: '#ff6e00',
|
|
iot: '#e3b341',
|
|
}
|
|
|
|
function serviceColor(port: number | null | undefined, category?: string | null): string {
|
|
if (port != null && PORT_COLORS[port]) return PORT_COLORS[port]
|
|
if (category && CATEGORY_COLORS[category.toLowerCase()]) return CATEGORY_COLORS[category.toLowerCase()]
|
|
return '#8b949e'
|
|
}
|
|
|
|
const TYPE_ICONS: Record<string, React.ElementType> = {
|
|
isp: Globe,
|
|
router: Router,
|
|
server: Server,
|
|
proxmox: Layers,
|
|
vm: Box,
|
|
lxc: Container,
|
|
nas: HardDrive,
|
|
iot: Cpu,
|
|
ap: Wifi,
|
|
switch: Network,
|
|
generic: Circle,
|
|
}
|
|
|
|
type SourceFilter = 'all' | 'ip' | 'zigbee' | 'zwave' | 'proxmox'
|
|
type StatusFilter = 'pending' | 'hidden'
|
|
|
|
function inferSource(d: PendingDevice): 'zigbee' | 'zwave' | 'proxmox' | 'ip' {
|
|
if (d.discovery_source === 'zwave') return 'zwave'
|
|
if (d.discovery_source === 'zigbee') return 'zigbee'
|
|
if (d.discovery_source === 'proxmox') return 'proxmox'
|
|
// Proxmox devices carry a synthetic 'pve-' ieee but are IP hosts, not mesh.
|
|
if (d.ieee_address && !d.ieee_address.startsWith('pve-')) return 'zigbee'
|
|
return 'ip'
|
|
}
|
|
|
|
const COMMON_PORTS = new Set([22, 80, 443])
|
|
|
|
function specialServiceName(d: PendingDevice): string | undefined {
|
|
const candidates = (d.services ?? []).filter(
|
|
(s) => s.category != null && s.port != null && !COMMON_PORTS.has(s.port) && s.service_name,
|
|
)
|
|
// Deprioritize generic web category so apps like home assistant / jellyfin win
|
|
const nonWeb = candidates.find((s) => s.category?.toLowerCase() !== 'web')
|
|
return (nonWeb ?? candidates[0])?.service_name ?? undefined
|
|
}
|
|
|
|
function deviceLabel(d: PendingDevice): string {
|
|
return d.friendly_name ?? d.hostname ?? specialServiceName(d) ?? d.ip ?? d.ieee_address ?? 'device'
|
|
}
|
|
|
|
function injectAutoEdges(edges: AutoEdge[] | undefined) {
|
|
if (!edges || edges.length === 0) return
|
|
useCanvasStore.setState((state) => ({
|
|
...applyAutoEdges(state.nodes, state.edges, edges),
|
|
hasUnsavedChanges: true,
|
|
}))
|
|
}
|
|
|
|
export function PendingDevicesModal({ open, onClose, highlightId, initialStatus = 'pending' }: PendingDevicesModalProps) {
|
|
const [devices, setDevices] = useState<PendingDevice[]>([])
|
|
const [loading, setLoading] = useState(false)
|
|
const [selected, setSelected] = useState<PendingDevice | null>(null)
|
|
const [selectMode, setSelectMode] = useState(false)
|
|
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
|
|
const [search, setSearch] = useState('')
|
|
const [sourceFilter, setSourceFilter] = useState<SourceFilter>('all')
|
|
const [typeFilter, setTypeFilter] = useState<string>('all')
|
|
const [statusFilter, setStatusFilter] = useState<StatusFilter>(initialStatus)
|
|
// Inventory shows on-canvas devices by default; toggle off to hide them.
|
|
const [showOnCanvas, setShowOnCanvas] = useState(true)
|
|
// Optionally restrict to devices that have at least one detected service.
|
|
const [withServicesOnly, setWithServicesOnly] = useState(false)
|
|
const { addNode, scanEventTs } = useCanvasStore()
|
|
const activeDesignId = useDesignStore((s) => s.activeDesignId)
|
|
const highlightRef = useRef<HTMLButtonElement>(null)
|
|
|
|
const load = useCallback(async () => {
|
|
setLoading(true)
|
|
try {
|
|
const res = statusFilter === 'pending' ? await scanApi.pending() : await scanApi.hidden()
|
|
setDevices(res.data)
|
|
} catch {
|
|
toast.error(`Failed to load ${statusFilter} devices`)
|
|
} finally {
|
|
setLoading(false)
|
|
}
|
|
}, [statusFilter])
|
|
|
|
useEffect(() => { if (open) load() }, [open, load])
|
|
useEffect(() => { if (open && scanEventTs > 0) load() }, [scanEventTs, open, load])
|
|
|
|
// Reset transient state when reopening
|
|
useEffect(() => {
|
|
if (!open) {
|
|
setSelectMode(false)
|
|
setSelectedIds(new Set())
|
|
setSearch('')
|
|
} else {
|
|
setStatusFilter(initialStatus)
|
|
}
|
|
}, [open, initialStatus])
|
|
|
|
const distinctTypes = useMemo(() => {
|
|
const set = new Set<string>()
|
|
devices.forEach((d) => { if (d.suggested_type) set.add(d.suggested_type) })
|
|
return [...set].sort()
|
|
}, [devices])
|
|
|
|
const filtered = useMemo(() => {
|
|
const q = search.trim().toLowerCase()
|
|
return devices.filter((d) => {
|
|
if (sourceFilter !== 'all' && inferSource(d) !== sourceFilter) return false
|
|
if (typeFilter !== 'all' && d.suggested_type !== typeFilter) return false
|
|
// Inventory-only: optionally hide devices already placed on a canvas.
|
|
if (statusFilter === 'pending' && !showOnCanvas && (d.canvas_count ?? 0) > 0) return false
|
|
if (withServicesOnly && (d.services?.length ?? 0) === 0) return false
|
|
if (q) {
|
|
const hay = [
|
|
d.friendly_name, d.hostname, d.ip, d.mac, d.ieee_address, d.vendor, d.model,
|
|
...d.services.map((s) => s.service_name),
|
|
].filter(Boolean).join(' ').toLowerCase()
|
|
if (!hay.includes(q)) return false
|
|
}
|
|
return true
|
|
})
|
|
}, [devices, search, sourceFilter, typeFilter, statusFilter, showOnCanvas, withServicesOnly])
|
|
|
|
useEffect(() => {
|
|
if (!highlightId || loading || !open) return
|
|
highlightRef.current?.scrollIntoView({ behavior: 'smooth', block: 'nearest' })
|
|
}, [highlightId, loading, open, filtered])
|
|
|
|
const toggleSelect = (id: string) => {
|
|
setSelectedIds((prev) => {
|
|
const next = new Set(prev)
|
|
if (next.has(id)) next.delete(id); else next.add(id)
|
|
return next
|
|
})
|
|
}
|
|
|
|
const handleCardClick = (d: PendingDevice) => {
|
|
if (selectMode) { toggleSelect(d.id); return }
|
|
if (statusFilter === 'hidden') { handleRestore(d); return }
|
|
setSelected(d)
|
|
}
|
|
|
|
const handleRestore = async (device: PendingDevice) => {
|
|
try {
|
|
await scanApi.restore(device.id)
|
|
setDevices((prev) => prev.filter((d) => d.id !== device.id))
|
|
toast.success(`Restored ${deviceLabel(device)}`)
|
|
} catch {
|
|
toast.error('Failed to restore device')
|
|
}
|
|
}
|
|
|
|
const handleBulkRestore = async () => {
|
|
const ids = [...selectedIds]
|
|
if (ids.length === 0) return
|
|
try {
|
|
const res = await scanApi.bulkRestore(ids)
|
|
setDevices((prev) => prev.filter((d) => !ids.includes(d.id)))
|
|
setSelectedIds(new Set())
|
|
toast.success(`Restored ${res.data.restored} device${res.data.restored !== 1 ? 's' : ''}`)
|
|
} catch {
|
|
toast.error('Failed to bulk restore devices')
|
|
}
|
|
}
|
|
|
|
const enterSelectMode = () => {
|
|
setSelectMode(true)
|
|
}
|
|
|
|
const exitSelectMode = () => {
|
|
setSelectMode(false)
|
|
setSelectedIds(new Set())
|
|
}
|
|
|
|
const selectAllVisible = () => {
|
|
setSelectedIds(new Set(filtered.map((d) => d.id)))
|
|
}
|
|
|
|
const handleClearAll = async () => {
|
|
const targets = filtered
|
|
if (targets.length === 0) return
|
|
const filtersActive = targets.length !== devices.length
|
|
try {
|
|
if (filtersActive) {
|
|
const results = await Promise.allSettled(targets.map((d) => scanApi.ignore(d.id)))
|
|
const failed = results.filter((r) => r.status === 'rejected').length
|
|
const removedIds = new Set(
|
|
targets.filter((_, i) => results[i].status === 'fulfilled').map((d) => d.id)
|
|
)
|
|
setDevices((prev) => prev.filter((d) => !removedIds.has(d.id)))
|
|
setSelectedIds(new Set())
|
|
if (failed > 0) toast.error(`Removed ${removedIds.size}, ${failed} failed`)
|
|
else toast.success(`Removed ${removedIds.size} device${removedIds.size !== 1 ? 's' : ''}`)
|
|
} else {
|
|
// Clears only pending rows server-side; approved/on-canvas devices stay,
|
|
// so reload rather than blanking the whole inventory.
|
|
await scanApi.clearPending()
|
|
setSelectedIds(new Set())
|
|
await load()
|
|
toast.success('Pending devices cleared')
|
|
}
|
|
} catch {
|
|
toast.error('Failed to clear pending devices')
|
|
}
|
|
}
|
|
|
|
const handleApprove = async (device: PendingDevice) => {
|
|
try {
|
|
const fallbackLabel = deviceLabel(device)
|
|
const type = (device.suggested_type ?? 'generic') as NodeType
|
|
const zwave = isZwaveType(type)
|
|
const wireless = isZigbeeType(type) || zwave
|
|
const properties = zwave
|
|
? buildZwaveProperties(device)
|
|
: isZigbeeType(type)
|
|
? buildZigbeeProperties(device)
|
|
: [...(device.properties ?? []), ...buildMacProperty(device.mac)]
|
|
const nodeData = {
|
|
label: fallbackLabel,
|
|
type,
|
|
ip: device.ip ?? undefined,
|
|
mac: device.mac ?? undefined,
|
|
hostname: device.hostname ?? undefined,
|
|
status: wireless ? 'online' : 'unknown',
|
|
services: (device.services ?? []) as ServiceInfo[],
|
|
properties,
|
|
// Approve onto the design the user is viewing, not the first design.
|
|
design_id: activeDesignId ?? undefined,
|
|
}
|
|
const res = await scanApi.approve(device.id, nodeData)
|
|
const nodeId = res.data.node_id
|
|
addNode({
|
|
id: nodeId,
|
|
type: nodeData.type,
|
|
position: getCenteredPosition(),
|
|
data: { ...nodeData, status: wireless ? ('online' as const) : ('unknown' as const) },
|
|
})
|
|
injectAutoEdges(res.data.edges)
|
|
const extra = res.data.edges_created > 0 ? ` (+${res.data.edges_created} link${res.data.edges_created !== 1 ? 's' : ''})` : ''
|
|
toast.success(`Approved ${nodeData.label}${extra}`)
|
|
setDevices((prev) => prev.filter((d) => d.id !== device.id))
|
|
setSelected(null)
|
|
} catch {
|
|
toast.error('Failed to approve device')
|
|
}
|
|
}
|
|
|
|
const handleHide = async (device: PendingDevice) => {
|
|
try {
|
|
await scanApi.hide(device.id)
|
|
setDevices((prev) => prev.filter((d) => d.id !== device.id))
|
|
setSelected(null)
|
|
toast.success('Device hidden')
|
|
} catch {
|
|
toast.error('Failed to hide device')
|
|
}
|
|
}
|
|
|
|
const handleIgnore = async (device: PendingDevice) => {
|
|
try {
|
|
await scanApi.ignore(device.id)
|
|
setDevices((prev) => prev.filter((d) => d.id !== device.id))
|
|
setSelected(null)
|
|
} catch {
|
|
toast.error('Failed to remove device')
|
|
}
|
|
}
|
|
|
|
const handleBulkApprove = async () => {
|
|
const ids = [...selectedIds]
|
|
if (ids.length === 0) return
|
|
try {
|
|
const res = await scanApi.bulkApprove(ids, activeDesignId)
|
|
const deviceToNode: Record<string, string> = {}
|
|
res.data.device_ids.forEach((did, i) => { deviceToNode[did] = res.data.node_ids[i] })
|
|
const approvedDevices = devices.filter((d) => ids.includes(d.id))
|
|
const cols = Math.min(4, approvedDevices.length)
|
|
const rows = Math.ceil(approvedDevices.length / 4)
|
|
const origin = getCenteredPosition(cols * 160, rows * 100)
|
|
approvedDevices.forEach((d, i) => {
|
|
const nodeId = deviceToNode[d.id]
|
|
if (!nodeId) return
|
|
const type = (d.suggested_type ?? 'generic') as NodeType
|
|
const zwave = isZwaveType(type)
|
|
const wireless = isZigbeeType(type) || zwave
|
|
addNode({
|
|
id: nodeId,
|
|
type,
|
|
position: { x: origin.x + (i % 4) * 160, y: origin.y + Math.floor(i / 4) * 100 },
|
|
data: {
|
|
label: deviceLabel(d),
|
|
type,
|
|
ip: d.ip ?? undefined,
|
|
mac: d.mac ?? undefined,
|
|
hostname: d.hostname ?? undefined,
|
|
status: wireless ? ('online' as const) : ('unknown' as const),
|
|
services: (d.services ?? []) as ServiceInfo[],
|
|
properties: zwave
|
|
? buildZwaveProperties(d)
|
|
: isZigbeeType(type)
|
|
? buildZigbeeProperties(d)
|
|
: [...(d.properties ?? []), ...buildMacProperty(d.mac)],
|
|
},
|
|
})
|
|
})
|
|
injectAutoEdges(res.data.edges)
|
|
setDevices((prev) => prev.filter((d) => !ids.includes(d.id)))
|
|
setSelectedIds(new Set())
|
|
const linkExtra = res.data.edges_created > 0 ? ` (+${res.data.edges_created} link${res.data.edges_created !== 1 ? 's' : ''})` : ''
|
|
toast.success(`Approved ${res.data.approved} device${res.data.approved !== 1 ? 's' : ''}${linkExtra}`)
|
|
} catch {
|
|
toast.error('Failed to bulk approve devices')
|
|
}
|
|
}
|
|
|
|
const handleBulkHide = async () => {
|
|
const ids = [...selectedIds]
|
|
if (ids.length === 0) return
|
|
try {
|
|
const res = await scanApi.bulkHide(ids)
|
|
setDevices((prev) => prev.filter((d) => !ids.includes(d.id)))
|
|
setSelectedIds(new Set())
|
|
toast.success(`Hidden ${res.data.hidden} device${res.data.hidden !== 1 ? 's' : ''}`)
|
|
} catch {
|
|
toast.error('Failed to bulk hide devices')
|
|
}
|
|
}
|
|
|
|
// Keyboard shortcuts: 's' select-mode, 'a' select-all-visible, Esc clears selection or closes, '/' focuses search
|
|
const searchRef = useRef<HTMLInputElement>(null)
|
|
useEffect(() => {
|
|
if (!open) return
|
|
const handler = (e: KeyboardEvent) => {
|
|
const target = e.target as HTMLElement | null
|
|
const inField = target && (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.tagName === 'SELECT')
|
|
if (e.key === 'Escape') {
|
|
if (selectMode && selectedIds.size > 0) { e.preventDefault(); setSelectedIds(new Set()) }
|
|
return
|
|
}
|
|
if (inField) return
|
|
if (e.key === '/') { e.preventDefault(); searchRef.current?.focus() }
|
|
else if (e.key.toLowerCase() === 's') { e.preventDefault(); if (selectMode) exitSelectMode(); else enterSelectMode() }
|
|
else if (e.key.toLowerCase() === 'a' && selectMode) { e.preventDefault(); selectAllVisible() }
|
|
else if (e.key === 'Enter' && selectMode && selectedIds.size > 0) {
|
|
// Enter confirms the bulk action for the current view: approving
|
|
// hidden devices would be wrong — they restore.
|
|
e.preventDefault()
|
|
if (statusFilter === 'hidden') handleBulkRestore()
|
|
else handleBulkApprove()
|
|
}
|
|
}
|
|
window.addEventListener('keydown', handler)
|
|
return () => window.removeEventListener('keydown', handler)
|
|
// statusFilter is included so Enter dispatches the correct bulk action
|
|
// (approve vs restore) even if the device list doesn't change on switch.
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [open, selectMode, selectedIds, filtered, statusFilter])
|
|
|
|
return (
|
|
<>
|
|
<Dialog open={open} onOpenChange={(v) => { if (!v) onClose() }}>
|
|
<DialogContent
|
|
showCloseButton={false}
|
|
className="!max-w-none w-[95vw] h-[90vh] p-0 flex flex-col gap-0 bg-[#0d1117] border-border"
|
|
>
|
|
<DialogHeader className="px-4 py-3 border-b border-border shrink-0">
|
|
<div className="flex items-center justify-between gap-3">
|
|
<DialogTitle className="text-base font-semibold flex items-center gap-2">
|
|
{statusFilter === 'pending' ? 'Device Inventory' : 'Hidden Devices'}
|
|
<span className="text-muted-foreground font-normal text-xs">
|
|
({filtered.length}{filtered.length !== devices.length && ` of ${devices.length}`})
|
|
</span>
|
|
</DialogTitle>
|
|
<div className="flex items-center gap-1">
|
|
<button onClick={load} className="text-muted-foreground hover:text-foreground p-1.5 rounded transition-colors" title="Refresh">
|
|
<RefreshCw size={14} />
|
|
</button>
|
|
{statusFilter === 'pending' && devices.length > 0 && (
|
|
<button
|
|
onClick={handleClearAll}
|
|
className="text-muted-foreground hover:text-[#f85149] p-1.5 rounded transition-colors"
|
|
title={filtered.length !== devices.length ? `Remove ${filtered.length} filtered` : 'Clear all pending'}
|
|
>
|
|
<Trash2 size={14} />
|
|
</button>
|
|
)}
|
|
{/* Route the close X through Base UI's DialogClose (same path as
|
|
outside-click) instead of a raw onClick — the latter's synthetic
|
|
click was being dropped on Firefox/Windows. */}
|
|
<DialogClose
|
|
render={
|
|
<button
|
|
className="text-muted-foreground hover:text-foreground p-1.5 rounded transition-colors"
|
|
aria-label="Close"
|
|
/>
|
|
}
|
|
>
|
|
<X size={14} />
|
|
</DialogClose>
|
|
</div>
|
|
</div>
|
|
</DialogHeader>
|
|
|
|
{/* Toolbar */}
|
|
<div className="px-4 py-2 border-b border-border bg-[#161b22] shrink-0 flex flex-wrap items-center gap-2">
|
|
<div className="relative flex-1 min-w-[200px] max-w-md">
|
|
<Search size={12} className="absolute left-2 top-1/2 -translate-y-1/2 text-muted-foreground" />
|
|
<input
|
|
ref={searchRef}
|
|
value={search}
|
|
onChange={(e) => setSearch(e.target.value)}
|
|
placeholder="Search name, IP, MAC, IEEE, service…"
|
|
className="w-full text-xs bg-[#0d1117] border border-border rounded px-7 py-1.5 outline-none focus:border-[#00d4ff]/50"
|
|
/>
|
|
</div>
|
|
<div className="flex rounded border border-border overflow-hidden text-xs" role="group" aria-label="Source filter">
|
|
<button
|
|
onClick={() => setSourceFilter('all')}
|
|
className={`px-2.5 py-1.5 transition-colors ${sourceFilter === 'all' ? 'bg-[#00d4ff]/20 text-[#00d4ff]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
All
|
|
</button>
|
|
<button
|
|
onClick={() => setSourceFilter('ip')}
|
|
className={`px-2.5 py-1.5 transition-colors border-l border-border ${sourceFilter === 'ip' ? 'bg-[#a855f7]/20 text-[#a855f7]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
IP scan
|
|
</button>
|
|
<button
|
|
onClick={() => setSourceFilter('zigbee')}
|
|
className={`px-2.5 py-1.5 transition-colors border-l border-border ${sourceFilter === 'zigbee' ? 'bg-[#00d4ff]/20 text-[#00d4ff]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
Zigbee
|
|
</button>
|
|
<button
|
|
onClick={() => setSourceFilter('zwave')}
|
|
className={`px-2.5 py-1.5 transition-colors border-l border-border ${sourceFilter === 'zwave' ? 'bg-[#ff6e00]/20 text-[#ff6e00]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
Z-Wave
|
|
</button>
|
|
<button
|
|
onClick={() => setSourceFilter('proxmox')}
|
|
className={`px-2.5 py-1.5 transition-colors border-l border-border ${sourceFilter === 'proxmox' ? 'bg-[#e57000]/20 text-[#e57000]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
Proxmox
|
|
</button>
|
|
</div>
|
|
<select
|
|
value={typeFilter}
|
|
onChange={(e) => setTypeFilter(e.target.value)}
|
|
className="text-xs bg-[#0d1117] border border-border rounded px-2 py-1.5 outline-none focus:border-[#00d4ff]/50"
|
|
aria-label="Type filter"
|
|
>
|
|
<option value="all">All types</option>
|
|
{distinctTypes.map((t) => <option key={t} value={t}>{t}</option>)}
|
|
</select>
|
|
<div className="flex rounded border border-border overflow-hidden text-xs">
|
|
<button
|
|
onClick={() => setStatusFilter('pending')}
|
|
className={`px-2.5 py-1.5 transition-colors ${statusFilter === 'pending' ? 'bg-[#00d4ff]/20 text-[#00d4ff]' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
Inventory
|
|
</button>
|
|
<button
|
|
onClick={() => setStatusFilter('hidden')}
|
|
className={`px-2.5 py-1.5 transition-colors ${statusFilter === 'hidden' ? 'bg-[#8b949e]/20 text-foreground' : 'bg-[#0d1117] text-muted-foreground hover:text-foreground'}`}
|
|
>
|
|
Hidden
|
|
</button>
|
|
</div>
|
|
{statusFilter === 'pending' && (
|
|
<button
|
|
onClick={() => setShowOnCanvas((v) => !v)}
|
|
className={`flex items-center gap-1.5 text-xs px-2.5 py-1.5 rounded border transition-colors ${showOnCanvas ? 'bg-[#0d1117] text-muted-foreground border-border hover:text-foreground' : 'bg-[#00d4ff]/20 text-[#00d4ff] border-[#00d4ff]/50'}`}
|
|
title="Show or hide devices already on a canvas"
|
|
aria-pressed={!showOnCanvas}
|
|
>
|
|
<Layers size={12} />
|
|
{showOnCanvas ? 'Hide on-canvas' : 'Show on-canvas'}
|
|
</button>
|
|
)}
|
|
<button
|
|
onClick={() => setWithServicesOnly((v) => !v)}
|
|
className={`flex items-center gap-1.5 text-xs px-2.5 py-1.5 rounded border transition-colors ${withServicesOnly ? 'bg-[#00d4ff]/20 text-[#00d4ff] border-[#00d4ff]/50' : 'bg-[#0d1117] text-muted-foreground border-border hover:text-foreground'}`}
|
|
title="Only show devices with at least one detected service"
|
|
aria-pressed={withServicesOnly}
|
|
>
|
|
<ServerCog size={12} />
|
|
With services
|
|
</button>
|
|
<button
|
|
onClick={() => selectMode ? exitSelectMode() : enterSelectMode()}
|
|
className={`text-xs px-2.5 py-1.5 rounded border transition-colors ${selectMode ? 'bg-[#00d4ff]/20 text-[#00d4ff] border-[#00d4ff]/50' : 'bg-[#0d1117] text-muted-foreground border-border hover:text-foreground'}`}
|
|
title="Toggle select mode (s)"
|
|
>
|
|
{selectMode ? 'Exit select' : 'Select mode'}
|
|
</button>
|
|
</div>
|
|
|
|
{/* Body */}
|
|
<div className="flex-1 min-h-0 overflow-y-auto p-4">
|
|
{loading && (
|
|
<div className="flex items-center justify-center py-10">
|
|
<Loader2 size={20} className="animate-spin text-muted-foreground" />
|
|
</div>
|
|
)}
|
|
{!loading && filtered.length === 0 && (
|
|
<p className="text-xs text-muted-foreground text-center py-10">
|
|
{devices.length === 0 ? `No ${statusFilter} devices` : 'No devices match filters'}
|
|
</p>
|
|
)}
|
|
{!loading && filtered.length > 0 && (
|
|
<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-2">
|
|
{filtered.map((d) => (
|
|
<DeviceCard
|
|
key={d.id}
|
|
device={d}
|
|
selected={selectedIds.has(d.id)}
|
|
selectMode={selectMode}
|
|
highlighted={d.id === highlightId}
|
|
onClick={() => handleCardClick(d)}
|
|
cardRef={d.id === highlightId ? highlightRef : undefined}
|
|
/>
|
|
))}
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Selection action bar */}
|
|
{selectMode && (
|
|
<div className="px-4 py-2.5 border-t border-border bg-[#161b22] shrink-0 flex items-center gap-2 flex-wrap">
|
|
<span className="text-xs text-muted-foreground mr-1">
|
|
{selectedIds.size} selected
|
|
</span>
|
|
<button
|
|
onClick={selectAllVisible}
|
|
className="text-xs px-2.5 py-1.5 rounded border border-border text-muted-foreground hover:text-foreground transition-colors"
|
|
>
|
|
Select all visible ({filtered.length})
|
|
</button>
|
|
<button
|
|
onClick={() => setSelectedIds(new Set())}
|
|
disabled={selectedIds.size === 0}
|
|
className="text-xs px-2.5 py-1.5 rounded border border-border text-muted-foreground hover:text-foreground disabled:opacity-40 transition-colors"
|
|
>
|
|
Clear
|
|
</button>
|
|
<div className="flex-1" />
|
|
{statusFilter === 'pending' && (
|
|
<>
|
|
<button
|
|
onClick={handleBulkApprove}
|
|
disabled={selectedIds.size === 0}
|
|
className="text-xs px-3 py-1.5 rounded bg-[#39d353]/20 text-[#39d353] hover:bg-[#39d353]/30 disabled:opacity-40 font-medium transition-colors"
|
|
>
|
|
Approve ({selectedIds.size})
|
|
</button>
|
|
<button
|
|
onClick={handleBulkHide}
|
|
disabled={selectedIds.size === 0}
|
|
className="text-xs px-3 py-1.5 rounded bg-[#8b949e]/20 text-[#8b949e] hover:bg-[#8b949e]/30 disabled:opacity-40 font-medium transition-colors"
|
|
>
|
|
Hide ({selectedIds.size})
|
|
</button>
|
|
</>
|
|
)}
|
|
{statusFilter === 'hidden' && (
|
|
<button
|
|
onClick={handleBulkRestore}
|
|
disabled={selectedIds.size === 0}
|
|
className="text-xs px-3 py-1.5 rounded bg-[#e3b341]/20 text-[#e3b341] hover:bg-[#e3b341]/30 disabled:opacity-40 font-medium transition-colors"
|
|
>
|
|
Restore ({selectedIds.size})
|
|
</button>
|
|
)}
|
|
</div>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
|
|
<PendingDeviceModal
|
|
device={selected}
|
|
onClose={() => setSelected(null)}
|
|
onApprove={handleApprove}
|
|
onHide={handleHide}
|
|
onIgnore={handleIgnore}
|
|
/>
|
|
</>
|
|
)
|
|
}
|
|
|
|
interface DeviceCardProps {
|
|
device: PendingDevice
|
|
selected: boolean
|
|
selectMode: boolean
|
|
highlighted: boolean
|
|
onClick: () => void
|
|
cardRef?: React.Ref<HTMLButtonElement>
|
|
}
|
|
|
|
function DeviceCard({ device, selected, selectMode, highlighted, onClick, cardRef }: DeviceCardProps) {
|
|
const source = inferSource(device)
|
|
const roleType = (device.suggested_type ?? 'generic') as NodeType
|
|
const Icon = TYPE_ICONS[roleType] ?? Circle
|
|
const activeTheme = useThemeStore((s) => s.activeTheme)
|
|
// Colour the role badge with the same accent the node uses on the canvas
|
|
// (from the active theme / style section), instead of a flat grey.
|
|
const roleColor = resolveNodeColors({ type: roleType, custom_colors: undefined }, activeTheme).border
|
|
const label = deviceLabel(device)
|
|
const sourceColor =
|
|
source === 'zigbee' ? '#00d4ff'
|
|
: source === 'zwave' ? '#ff6e00'
|
|
: source === 'proxmox' ? '#e57000'
|
|
: '#a855f7'
|
|
const sourceLabel =
|
|
source === 'zigbee' ? 'ZIGBEE'
|
|
: source === 'zwave' ? 'Z-WAVE'
|
|
: source === 'proxmox' ? 'PROXMOX'
|
|
: (device.discovery_source ?? 'IP').toUpperCase()
|
|
const services = device.services ?? []
|
|
const visibleServices = services.slice(0, 4)
|
|
const moreServices = services.length - visibleServices.length
|
|
|
|
// Timestamps: a device placed on a canvas shows its linked node's lifecycle
|
|
// (created / last scan / last modified / last seen). A device that is only in
|
|
// the discovery inventory has no node yet, so it falls back to when the
|
|
// scanner first saw it.
|
|
const onCanvas = (device.canvas_count ?? 0) > 0
|
|
const timestamps: { label: string; iso: string }[] = []
|
|
if (onCanvas) {
|
|
if (device.node_created_at) timestamps.push({ label: 'Created', iso: device.node_created_at })
|
|
if (device.node_last_scan) timestamps.push({ label: 'Scan', iso: device.node_last_scan })
|
|
if (device.node_last_modified) timestamps.push({ label: 'Modified', iso: device.node_last_modified })
|
|
if (device.node_last_seen) timestamps.push({ label: 'Seen', iso: device.node_last_seen })
|
|
}
|
|
if (timestamps.length === 0) {
|
|
timestamps.push({ label: 'Discovered', iso: device.discovered_at })
|
|
}
|
|
|
|
const borderClass = highlighted
|
|
? 'border-[#e3b341] bg-[#2d3748]'
|
|
: selected
|
|
? 'border-[#00d4ff] bg-[#00d4ff]/5 shadow-[0_0_0_1px_rgba(0,212,255,0.4)] scale-[1.02]'
|
|
: 'border-border bg-[#161b22] hover:border-[#30363d] hover:bg-[#21262d]'
|
|
|
|
return (
|
|
<button
|
|
ref={cardRef}
|
|
onClick={onClick}
|
|
data-testid={`pending-card-${device.id}`}
|
|
className={`relative text-left rounded-lg border p-2.5 transition-all duration-150 ${borderClass}`}
|
|
>
|
|
{selectMode && selected && (
|
|
<CheckCircle2
|
|
size={18}
|
|
className="absolute top-2 right-2 text-[#00d4ff] fill-[#0d1117] z-10"
|
|
/>
|
|
)}
|
|
{!selectMode && device.status === 'hidden' && (
|
|
<EyeOff size={14} className="absolute top-2 right-2 text-muted-foreground" />
|
|
)}
|
|
{/* Canvas-presence corner: how many canvases this device already sits on.
|
|
Hidden while a select-mode checkmark occupies the same corner. */}
|
|
{device.status !== 'hidden' && (device.canvas_count ?? 0) > 0 && !(selectMode && selected) && (
|
|
<div
|
|
className="absolute top-0 right-0 flex items-center gap-1 rounded-bl-lg rounded-tr-lg bg-[#00d4ff] text-[#0d1117] text-xs font-bold px-2 py-1 shadow-md"
|
|
title={`On ${device.canvas_count} canvas${device.canvas_count !== 1 ? 'es' : ''}`}
|
|
aria-label={`On ${device.canvas_count} canvas${device.canvas_count !== 1 ? 'es' : ''}`}
|
|
>
|
|
<Layers size={12} strokeWidth={2.5} />
|
|
{device.canvas_count}
|
|
</div>
|
|
)}
|
|
|
|
{/* Header */}
|
|
<div className="flex items-start gap-2 mb-2">
|
|
<div className="shrink-0 w-8 h-8 rounded bg-[#21262d] flex items-center justify-center text-foreground">
|
|
<Icon size={16} />
|
|
</div>
|
|
<div className="flex-1 min-w-0">
|
|
<div className="text-sm font-medium text-foreground break-all leading-snug">{label}</div>
|
|
<div className="flex items-center gap-1 mt-0.5 flex-wrap">
|
|
<span
|
|
className="text-[9px] font-mono px-1.5 py-0.5 rounded uppercase tracking-wider"
|
|
style={{ background: `${sourceColor}22`, color: sourceColor }}
|
|
>
|
|
{sourceLabel}
|
|
</span>
|
|
{device.suggested_type && (
|
|
<span
|
|
className="text-[9px] font-mono px-1.5 py-0.5 rounded uppercase tracking-wider"
|
|
style={{ background: `${roleColor}22`, color: roleColor }}
|
|
>
|
|
{device.suggested_type}
|
|
</span>
|
|
)}
|
|
{device.lqi != null && (
|
|
<span className="text-[9px] font-mono px-1.5 py-0.5 rounded uppercase tracking-wider bg-[#21262d] text-muted-foreground">
|
|
LQI {device.lqi}
|
|
</span>
|
|
)}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Tech grid */}
|
|
<div className="grid grid-cols-2 gap-x-2 gap-y-0.5 text-[11px] mb-2">
|
|
{device.ip && <InfoLine label="IP" value={device.ip} />}
|
|
{device.mac && <InfoLine label="MAC" value={device.mac} />}
|
|
{device.ieee_address && <InfoLine label="IEEE" value={device.ieee_address} />}
|
|
{device.hostname && <InfoLine label="Host" value={device.hostname} />}
|
|
{device.vendor && <InfoLine label="Vendor" value={device.vendor} />}
|
|
{device.model && <InfoLine label="Model" value={device.model} />}
|
|
</div>
|
|
|
|
{/* Services */}
|
|
{visibleServices.length > 0 && (
|
|
<div className="flex items-center gap-1 flex-wrap">
|
|
{visibleServices.map((s, i) => {
|
|
const color = serviceColor(s.port, s.category)
|
|
return (
|
|
<span
|
|
key={`${s.port}-${s.protocol}-${i}`}
|
|
className="text-[9px] font-mono px-1.5 py-0.5 rounded uppercase tracking-wider"
|
|
style={{ background: `${color}22`, color }}
|
|
title={`${s.service_name} (${s.protocol}/${s.port})`}
|
|
>
|
|
{s.service_name}
|
|
</span>
|
|
)
|
|
})}
|
|
{moreServices > 0 && (
|
|
<span className="text-[9px] font-mono px-1.5 py-0.5 rounded bg-[#21262d] text-muted-foreground">
|
|
+{moreServices}
|
|
</span>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{/* Timestamps — compact relative times, full date on hover. Kept tiny so
|
|
the tile footprint stays the same as before. */}
|
|
<div className="mt-2 pt-2 border-t border-border/50 grid grid-cols-2 gap-x-2 gap-y-0.5 text-[10px]">
|
|
{timestamps.map((t) => (
|
|
<TimeLine key={t.label} label={t.label} iso={t.iso} />
|
|
))}
|
|
</div>
|
|
</button>
|
|
)
|
|
}
|
|
|
|
function InfoLine({ label, value }: { label: string; value: string }) {
|
|
return (
|
|
<div className="flex items-baseline gap-1.5 min-w-0">
|
|
<span className="text-muted-foreground shrink-0 w-12">{label}</span>
|
|
<span className="font-mono text-foreground truncate">{value}</span>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
function TimeLine({ label, iso }: { label: string; iso: string }) {
|
|
return (
|
|
<div className="flex items-baseline gap-1 min-w-0" title={formatTimestamp(iso)}>
|
|
<span className="text-muted-foreground shrink-0">{label}</span>
|
|
<span className="font-mono text-foreground/80 truncate">{formatRelative(iso)}</span>
|
|
</div>
|
|
)
|
|
}
|