0e260ede73
Replace the inline sidebar 'history' view with a dedicated ScanHistoryModal. Same data and actions (refresh, auto-refresh while running, stop scan, transition toasts) plus run duration, finished timestamp, and kind/status filters. Scan/Zigbee start now surface a toast instead of force-switching the sidebar view. ha-relevant: yes
330 lines
13 KiB
TypeScript
330 lines
13 KiB
TypeScript
import { useState, useCallback } from 'react'
|
|
import { Plus, Save, ScanLine, ChevronLeft, ChevronRight, LayoutDashboard, Clock, EyeOff, Square, Settings, LogOut, Network, Type, PlusCircle, Pencil, Trash2 } from 'lucide-react'
|
|
import { Logo } from '@/components/ui/Logo'
|
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
|
import { useCanvasStore } from '@/stores/canvasStore'
|
|
import { useDesignStore } from '@/stores/designStore'
|
|
import { useAuthStore } from '@/stores/authStore'
|
|
import { designsApi } from '@/api/client'
|
|
import { resolveDesignIcon, DEFAULT_DESIGN_ICON } from '@/utils/designIcons'
|
|
import { DesignModal, type DesignFormData } from '@/components/modals/DesignModal'
|
|
import type { Design } from '@/types'
|
|
import { toast } from 'sonner'
|
|
import { useLatestRelease } from '@/hooks/useLatestRelease'
|
|
|
|
const STANDALONE = import.meta.env.VITE_STANDALONE === 'true'
|
|
|
|
const PENDING_TRIGGERS: { kind: 'pending' | 'hidden'; icon: typeof ScanLine; label: string }[] = [
|
|
{ kind: 'pending', icon: ScanLine, label: 'Pending Devices' },
|
|
{ kind: 'hidden', icon: EyeOff, label: 'Hidden Devices' },
|
|
]
|
|
|
|
interface SidebarProps {
|
|
onAddNode: () => void
|
|
onAddGroupRect: () => void
|
|
onAddText: () => void
|
|
onScan: () => void
|
|
onZigbeeImport: () => void
|
|
onSave: () => void
|
|
onOpenSettings: () => void
|
|
onOpenHistory: () => void
|
|
onOpenPending: (deviceId?: string, status?: 'pending' | 'hidden') => void
|
|
}
|
|
|
|
export function Sidebar({ onAddNode, onAddGroupRect, onAddText, onScan, onZigbeeImport, onSave, onOpenSettings, onOpenHistory, onOpenPending }: SidebarProps) {
|
|
const [collapsed, setCollapsed] = useState(false)
|
|
const logout = useAuthStore((s) => s.logout)
|
|
const { designs, activeDesignId, setActiveDesign, addDesign, updateDesign, removeDesign } = useDesignStore()
|
|
const [designSwitcherOpen, setDesignSwitcherOpen] = useState(false)
|
|
const [designModal, setDesignModal] = useState<{ mode: 'create' | 'edit'; design?: Design } | null>(null)
|
|
|
|
const handleDesignSubmit = useCallback(async (data: DesignFormData) => {
|
|
if (!designModal) return
|
|
try {
|
|
if (designModal.mode === 'create') {
|
|
const res = await designsApi.create({ name: data.name, icon: data.icon })
|
|
addDesign(res.data)
|
|
} else if (designModal.design) {
|
|
const res = await designsApi.update(designModal.design.id, { name: data.name, icon: data.icon })
|
|
updateDesign(res.data.id, { name: res.data.name, icon: res.data.icon })
|
|
}
|
|
setDesignModal(null)
|
|
} catch {
|
|
toast.error(designModal.mode === 'create' ? 'Failed to create canvas' : 'Failed to update canvas')
|
|
}
|
|
}, [designModal, addDesign, updateDesign])
|
|
|
|
const handleDesignDelete = useCallback(async (d: Design) => {
|
|
if (designs.length <= 1) { toast.error('Cannot delete the only canvas'); return }
|
|
if (!window.confirm(`Delete canvas "${d.name}"? Its nodes and links will be removed.`)) return
|
|
try {
|
|
await designsApi.delete(d.id)
|
|
removeDesign(d.id)
|
|
toast.success('Canvas deleted')
|
|
} catch {
|
|
toast.error('Failed to delete canvas')
|
|
}
|
|
}, [designs.length, removeDesign])
|
|
|
|
const { nodes, hasUnsavedChanges } = useCanvasStore()
|
|
|
|
const networkNodes = nodes.filter((n) => n.data.type !== 'groupRect' && n.data.type !== 'text')
|
|
const onlineCount = networkNodes.filter((n) => n.data.status === 'online').length
|
|
const offlineCount = networkNodes.filter((n) => n.data.status === 'offline').length
|
|
|
|
const handleScan = useCallback(() => {
|
|
onScan()
|
|
}, [onScan])
|
|
|
|
return (
|
|
<aside
|
|
className="flex flex-col border-r border-border bg-[#161b22] transition-all duration-200 relative shrink-0"
|
|
style={{ width: collapsed ? 48 : 220 }}
|
|
>
|
|
{/* Toggle */}
|
|
<button
|
|
onClick={() => setCollapsed((c) => !c)}
|
|
className="absolute -right-3 top-6 z-10 flex items-center justify-center w-6 h-6 rounded-full border border-border bg-[#21262d] text-muted-foreground hover:text-foreground transition-colors"
|
|
>
|
|
{collapsed ? <ChevronRight size={12} /> : <ChevronLeft size={12} />}
|
|
</button>
|
|
|
|
{/* Logo */}
|
|
<div className="flex items-center px-3 py-4 border-b border-border overflow-hidden">
|
|
<Logo size={28} showText={!collapsed} />
|
|
</div>
|
|
|
|
{/* Design Switcher */}
|
|
{!collapsed && designs.length > 0 && (
|
|
<div className="px-2 pt-2 pb-1 border-b border-border relative">
|
|
<button
|
|
onClick={() => setDesignSwitcherOpen((o) => !o)}
|
|
className="flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-xs font-medium bg-[#21262d] border border-border hover:border-[#30363d] transition-colors cursor-pointer"
|
|
>
|
|
{activeDesignId ? (() => {
|
|
const active = designs.find((d) => d.id === activeDesignId)
|
|
const Icon = resolveDesignIcon(active?.icon)
|
|
return <><Icon size={14} className="shrink-0 text-[#00d4ff]" /><span className="truncate text-foreground">{active?.name ?? 'Select Canvas'}</span></>
|
|
})() : <span className="text-muted-foreground">Select Canvas</span>}
|
|
</button>
|
|
{designSwitcherOpen && (
|
|
<>
|
|
{/* Overlay to close */}
|
|
<div className="fixed inset-0 z-40" onClick={() => setDesignSwitcherOpen(false)} />
|
|
<div className="absolute left-2 right-2 top-full mt-1 z-50 bg-[#21262d] border border-border rounded-md shadow-xl overflow-hidden">
|
|
{designs.map((d) => {
|
|
const Icon = resolveDesignIcon(d.icon)
|
|
const isActive = d.id === activeDesignId
|
|
return (
|
|
<div
|
|
key={d.id}
|
|
className={`group flex items-center transition-colors ${
|
|
isActive ? 'bg-[#00d4ff]/10 text-[#00d4ff]' : 'text-muted-foreground hover:bg-[#30363d]'
|
|
}`}
|
|
>
|
|
<button
|
|
onClick={() => { setActiveDesign(d.id); setDesignSwitcherOpen(false) }}
|
|
className="flex items-center gap-2 flex-1 min-w-0 px-3 py-2 text-xs cursor-pointer hover:text-foreground"
|
|
>
|
|
<Icon size={14} className="shrink-0" />
|
|
<span className="truncate">{d.name}</span>
|
|
</button>
|
|
<button
|
|
aria-label={`Edit ${d.name}`}
|
|
title="Edit canvas"
|
|
onClick={() => { setDesignModal({ mode: 'edit', design: d }); setDesignSwitcherOpen(false) }}
|
|
className="shrink-0 p-1.5 text-muted-foreground hover:text-foreground cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity"
|
|
>
|
|
<Pencil size={12} />
|
|
</button>
|
|
<button
|
|
aria-label={`Delete ${d.name}`}
|
|
title="Delete canvas"
|
|
disabled={designs.length <= 1}
|
|
onClick={() => handleDesignDelete(d)}
|
|
className="shrink-0 p-1.5 pr-2 text-muted-foreground hover:text-[#f85149] cursor-pointer opacity-0 group-hover:opacity-100 transition-opacity disabled:opacity-0"
|
|
>
|
|
<Trash2 size={12} />
|
|
</button>
|
|
</div>
|
|
)
|
|
})}
|
|
<div className="border-t border-border" />
|
|
<button
|
|
onClick={() => { setDesignModal({ mode: 'create' }); setDesignSwitcherOpen(false) }}
|
|
className="flex items-center gap-2 w-full px-3 py-2 text-xs text-[#00d4ff] hover:bg-[#00d4ff]/10 transition-colors cursor-pointer"
|
|
>
|
|
<PlusCircle size={14} />
|
|
<span>New Canvas</span>
|
|
</button>
|
|
</div>
|
|
</>
|
|
)}
|
|
</div>
|
|
)}
|
|
|
|
{/* Views */}
|
|
<nav className="flex flex-col gap-0.5 p-2">
|
|
<SidebarItem
|
|
icon={LayoutDashboard}
|
|
label="Canvas"
|
|
collapsed={collapsed}
|
|
active
|
|
/>
|
|
{!STANDALONE && PENDING_TRIGGERS.map((t) => (
|
|
<SidebarItem
|
|
key={t.kind}
|
|
icon={t.icon}
|
|
label={t.label}
|
|
collapsed={collapsed}
|
|
onClick={() => onOpenPending(undefined, t.kind)}
|
|
/>
|
|
))}
|
|
{!STANDALONE && (
|
|
<SidebarItem
|
|
icon={Clock}
|
|
label="Scan History"
|
|
collapsed={collapsed}
|
|
onClick={onOpenHistory}
|
|
/>
|
|
)}
|
|
</nav>
|
|
|
|
{!collapsed && <div className="flex-1" />}
|
|
|
|
{/* Stats footer */}
|
|
{!collapsed && (
|
|
<div className="px-3 py-2 border-t border-border text-xs text-muted-foreground space-y-0.5">
|
|
<div className="flex justify-between">
|
|
<span>Total</span>
|
|
<span className="text-foreground font-mono">{networkNodes.length}</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-[#39d353]">Online</span>
|
|
<span className="font-mono text-[#39d353]">{onlineCount}</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-[#f85149]">Offline</span>
|
|
<span className="font-mono text-[#f85149]">{offlineCount}</span>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Actions */}
|
|
<div className="flex flex-col gap-0.5 p-2 border-t border-border">
|
|
<SidebarItem icon={Plus} label="Add Node" collapsed={collapsed} onClick={onAddNode} />
|
|
<SidebarItem icon={Square} label="Add Zone" collapsed={collapsed} onClick={onAddGroupRect} />
|
|
<SidebarItem icon={Type} label="Add Text" collapsed={collapsed} onClick={onAddText} />
|
|
{!STANDALONE && <SidebarItem icon={ScanLine} label="Scan Network" collapsed={collapsed} onClick={handleScan} />}
|
|
{!STANDALONE && <SidebarItem icon={Network} label="Zigbee Import" collapsed={collapsed} onClick={onZigbeeImport} />}
|
|
<SidebarItem
|
|
icon={Save}
|
|
label="Save Canvas"
|
|
collapsed={collapsed}
|
|
onClick={() => onSave()}
|
|
badge={hasUnsavedChanges}
|
|
accent
|
|
/>
|
|
<SidebarItem
|
|
icon={Settings}
|
|
label="Settings"
|
|
collapsed={collapsed}
|
|
onClick={onOpenSettings}
|
|
/>
|
|
{!STANDALONE && (
|
|
<SidebarItem
|
|
icon={LogOut}
|
|
label="Logout"
|
|
collapsed={collapsed}
|
|
onClick={logout}
|
|
/>
|
|
)}
|
|
</div>
|
|
|
|
{!collapsed && <VersionBadge />}
|
|
|
|
<DesignModal
|
|
key={designModal?.mode === 'edit' ? designModal.design?.id : 'create'}
|
|
open={!!designModal}
|
|
onClose={() => setDesignModal(null)}
|
|
onSubmit={handleDesignSubmit}
|
|
initial={designModal?.mode === 'edit' && designModal.design
|
|
? { name: designModal.design.name, icon: designModal.design.icon ?? DEFAULT_DESIGN_ICON }
|
|
: undefined}
|
|
title={designModal?.mode === 'edit' ? 'Edit Canvas' : 'New Canvas'}
|
|
submitLabel={designModal?.mode === 'edit' ? 'Save' : 'Create'}
|
|
/>
|
|
</aside>
|
|
)
|
|
}
|
|
|
|
function VersionBadge() {
|
|
const current = __APP_VERSION__
|
|
const { latest, hasUpdate } = useLatestRelease(current)
|
|
|
|
return (
|
|
<div className="px-3 py-2 border-t border-border flex flex-col gap-1">
|
|
<a
|
|
href={`https://github.com/Pouzor/homelable/releases/tag/v${current}`}
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
className="font-mono text-[11px] text-muted-foreground hover:text-foreground transition-colors"
|
|
>
|
|
v{current}
|
|
</a>
|
|
{hasUpdate && latest && (
|
|
<a
|
|
href={latest.url.startsWith('https://') ? latest.url : '#'}
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
className="inline-flex items-center gap-1 px-1.5 py-0.5 rounded text-[10px] font-medium bg-[#e3b341]/15 text-[#e3b341] border border-[#e3b341]/30 hover:bg-[#e3b341]/25 transition-colors self-start"
|
|
>
|
|
↑ v{latest.version} available
|
|
</a>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
interface SidebarItemProps {
|
|
icon: React.ElementType
|
|
label: string
|
|
collapsed: boolean
|
|
active?: boolean
|
|
badge?: boolean
|
|
accent?: boolean
|
|
onClick?: () => void
|
|
}
|
|
|
|
function SidebarItem({ icon: Icon, label, collapsed, active, badge, accent, onClick }: SidebarItemProps) {
|
|
const btn = (
|
|
<button
|
|
onClick={onClick}
|
|
className={`relative flex items-center gap-2 w-full px-2 py-1.5 rounded-md text-sm transition-colors cursor-pointer ${
|
|
active
|
|
? 'bg-[#00d4ff]/10 text-[#00d4ff]'
|
|
: accent
|
|
? 'text-[#00d4ff] hover:bg-[#00d4ff]/10'
|
|
: 'text-muted-foreground hover:text-foreground hover:bg-[#21262d]'
|
|
}`}
|
|
>
|
|
<Icon size={16} className="shrink-0" />
|
|
{!collapsed && <span className="truncate">{label}</span>}
|
|
{badge && (
|
|
<span className="absolute top-1 right-1 w-1.5 h-1.5 rounded-full bg-[#e3b341]" />
|
|
)}
|
|
</button>
|
|
)
|
|
|
|
if (collapsed) {
|
|
return (
|
|
<Tooltip>
|
|
<TooltipTrigger>{btn}</TooltipTrigger>
|
|
<TooltipContent side="right">{label}</TooltipContent>
|
|
</Tooltip>
|
|
)
|
|
}
|
|
|
|
return btn
|
|
}
|