feat: Add folder customization support to sidebar

Updates the left sidebar to display custom folder colors and icons:
- FolderCard component now accepts folderColor and folderIcon props
- LeftSidebar fetches folder metadata and passes to FolderCard
- Supports same 10 icons as host manager (Folder, Server, Cloud, Database, Box, Package, Layers, Archive, HardDrive, Globe)
- Folder metadata refreshes with host data and on ssh-hosts:changed events

This ensures the sidebar reflects folder appearance changes made in the host manager.
This commit is contained in:
ZacharyZcR
2025-11-09 16:18:55 +08:00
parent af23882f50
commit c63ec9d8be
2 changed files with 75 additions and 15 deletions

View File

@@ -34,8 +34,9 @@ import {
import { Input } from "@/components/ui/input.tsx"; import { Input } from "@/components/ui/input.tsx";
import { Button } from "@/components/ui/button.tsx"; import { Button } from "@/components/ui/button.tsx";
import { FolderCard } from "@/ui/desktop/navigation/hosts/FolderCard.tsx"; import { FolderCard } from "@/ui/desktop/navigation/hosts/FolderCard.tsx";
import { getSSHHosts } from "@/ui/main-axios.ts"; import { getSSHHosts, getSSHFolders } from "@/ui/main-axios.ts";
import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx"; import { useTabs } from "@/ui/desktop/navigation/tabs/TabContext.tsx";
import type { SSHFolder } from "@/types/index.ts";
interface SSHHost { interface SSHHost {
id: number; id: number;
@@ -145,6 +146,20 @@ export function LeftSidebar({
const prevHostsRef = React.useRef<SSHHost[]>([]); const prevHostsRef = React.useRef<SSHHost[]>([]);
const [search, setSearch] = useState(""); const [search, setSearch] = useState("");
const [debouncedSearch, setDebouncedSearch] = useState(""); const [debouncedSearch, setDebouncedSearch] = useState("");
const [folderMetadata, setFolderMetadata] = useState<Map<string, SSHFolder>>(new Map());
const fetchFolderMetadata = React.useCallback(async () => {
try {
const folders = await getSSHFolders();
const metadataMap = new Map<string, SSHFolder>();
folders.forEach((folder) => {
metadataMap.set(folder.name, folder);
});
setFolderMetadata(metadataMap);
} catch (error) {
console.error("Failed to fetch folder metadata:", error);
}
}, []);
const fetchHosts = React.useCallback(async () => { const fetchHosts = React.useCallback(async () => {
try { try {
@@ -210,13 +225,18 @@ export function LeftSidebar({
React.useEffect(() => { React.useEffect(() => {
fetchHosts(); fetchHosts();
const interval = setInterval(fetchHosts, 300000); fetchFolderMetadata();
const interval = setInterval(() => {
fetchHosts();
fetchFolderMetadata();
}, 300000);
return () => clearInterval(interval); return () => clearInterval(interval);
}, [fetchHosts]); }, [fetchHosts, fetchFolderMetadata]);
React.useEffect(() => { React.useEffect(() => {
const handleHostsChanged = () => { const handleHostsChanged = () => {
fetchHosts(); fetchHosts();
fetchFolderMetadata();
}; };
const handleCredentialsChanged = () => { const handleCredentialsChanged = () => {
fetchHosts(); fetchHosts();
@@ -239,7 +259,7 @@ export function LeftSidebar({
handleCredentialsChanged as EventListener, handleCredentialsChanged as EventListener,
); );
}; };
}, [fetchHosts]); }, [fetchHosts, fetchFolderMetadata]);
React.useEffect(() => { React.useEffect(() => {
const handler = setTimeout(() => setDebouncedSearch(search), 200); const handler = setTimeout(() => setDebouncedSearch(search), 200);
@@ -437,15 +457,20 @@ export function LeftSidebar({
</div> </div>
)} )}
{sortedFolders.map((folder, idx) => ( {sortedFolders.map((folder, idx) => {
<FolderCard const metadata = folderMetadata.get(folder);
key={`folder-${folder}-${hostsByFolder[folder]?.length || 0}`} return (
folderName={folder} <FolderCard
hosts={getSortedHosts(hostsByFolder[folder])} key={`folder-${folder}-${hostsByFolder[folder]?.length || 0}`}
isFirst={idx === 0} folderName={folder}
isLast={idx === sortedFolders.length - 1} hosts={getSortedHosts(hostsByFolder[folder])}
/> isFirst={idx === 0}
))} isLast={idx === sortedFolders.length - 1}
folderColor={metadata?.color}
folderIcon={metadata?.icon}
/>
);
})}
</SidebarGroup> </SidebarGroup>
</SidebarContent> </SidebarContent>
<Separator className="p-0.25 mt-1 mb-1" /> <Separator className="p-0.25 mt-1 mb-1" />

View File

@@ -1,6 +1,18 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { CardTitle } from "@/components/ui/card.tsx"; import { CardTitle } from "@/components/ui/card.tsx";
import { ChevronDown, Folder } from "lucide-react"; import {
ChevronDown,
Folder,
Server,
Cloud,
Database,
Box,
Package,
Layers,
Archive,
HardDrive,
Globe,
} from "lucide-react";
import { Button } from "@/components/ui/button.tsx"; import { Button } from "@/components/ui/button.tsx";
import { Host } from "@/ui/desktop/navigation/hosts/Host.tsx"; import { Host } from "@/ui/desktop/navigation/hosts/Host.tsx";
import { Separator } from "@/components/ui/separator.tsx"; import { Separator } from "@/components/ui/separator.tsx";
@@ -40,11 +52,15 @@ interface FolderCardProps {
hosts: SSHHost[]; hosts: SSHHost[];
isFirst: boolean; isFirst: boolean;
isLast: boolean; isLast: boolean;
folderColor?: string;
folderIcon?: string;
} }
export function FolderCard({ export function FolderCard({
folderName, folderName,
hosts, hosts,
folderColor,
folderIcon,
}: FolderCardProps): React.ReactElement { }: FolderCardProps): React.ReactElement {
const [isExpanded, setIsExpanded] = useState(true); const [isExpanded, setIsExpanded] = useState(true);
@@ -52,6 +68,21 @@ export function FolderCard({
setIsExpanded(!isExpanded); setIsExpanded(!isExpanded);
}; };
const iconMap: Record<string, React.ComponentType<{ size?: number; strokeWidth?: number; className?: string; style?: React.CSSProperties }>> = {
Folder,
Server,
Cloud,
Database,
Box,
Package,
Layers,
Archive,
HardDrive,
Globe,
};
const FolderIcon = folderIcon && iconMap[folderIcon] ? iconMap[folderIcon] : Folder;
return ( return (
<div className="bg-dark-bg-darker border-2 border-dark-border rounded-lg overflow-hidden p-0 m-0"> <div className="bg-dark-bg-darker border-2 border-dark-border rounded-lg overflow-hidden p-0 m-0">
<div <div
@@ -59,7 +90,11 @@ export function FolderCard({
> >
<div className="flex gap-2 pr-10"> <div className="flex gap-2 pr-10">
<div className="flex-shrink-0 flex items-center"> <div className="flex-shrink-0 flex items-center">
<Folder size={16} strokeWidth={3} /> <FolderIcon
size={16}
strokeWidth={3}
style={folderColor ? { color: folderColor } : undefined}
/>
</div> </div>
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<CardTitle className="mb-0 leading-tight break-words text-md"> <CardTitle className="mb-0 leading-tight break-words text-md">