From 06d4572aa0c256ceb50c6c5a9efdf96e91f1a8ea Mon Sep 17 00:00:00 2001 From: "LAPTOP-O016UC3M\\Qi Chen" <16399091+binaricat@users.noreply.github.com> Date: Mon, 8 Dec 2025 18:32:13 +0800 Subject: [PATCH] Implement feature X to enhance user experience and fix bug Y in module Z --- components/SftpViewNew.tsx | 2314 ++++++++++++++++++------------------ 1 file changed, 1157 insertions(+), 1157 deletions(-) diff --git a/components/SftpViewNew.tsx b/components/SftpViewNew.tsx index 97d092cdf..ec607e9db 100644 --- a/components/SftpViewNew.tsx +++ b/components/SftpViewNew.tsx @@ -10,1265 +10,1265 @@ import { DistroAvatar } from './DistroAvatar'; import { useSftpState, SftpPane } from '../application/state/useSftpState'; import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuSeparator, ContextMenuTrigger } from './ui/context-menu'; import { - FileCode, - Folder, - HardDrive, - Monitor, - Plus, - X, - RefreshCw, - ChevronLeft, - ChevronRight, - ArrowDown, - Loader2, - AlertCircle, - CheckCircle2, - XCircle, - Trash2, - Download, - Upload, - FolderPlus, - Pencil, - Copy, - ChevronDown, - Home, - Search, - Shield, + FileCode, + Folder, + HardDrive, + Monitor, + Plus, + X, + RefreshCw, + ChevronLeft, + ChevronRight, + ArrowDown, + Loader2, + AlertCircle, + CheckCircle2, + XCircle, + Trash2, + Download, + Upload, + FolderPlus, + Pencil, + Copy, + ChevronDown, + Home, + Search, + Shield, } from 'lucide-react'; // File icon helper const getFileIcon = (entry: SftpFileEntry) => { - if (entry.type === 'directory') return ; - const ext = entry.name.split('.').pop()?.toLowerCase(); - switch (ext) { - case 'sh': - case 'bash': - case 'zsh': - return ; - case 'js': - case 'ts': - case 'jsx': - case 'tsx': - return ; - case 'py': - return ; - case 'json': - case 'yml': - case 'yaml': - case 'xml': - return ; - case 'md': - case 'txt': - return ; - default: - return ; - } + if (entry.type === 'directory') return ; + const ext = entry.name.split('.').pop()?.toLowerCase(); + switch (ext) { + case 'sh': + case 'bash': + case 'zsh': + return ; + case 'js': + case 'ts': + case 'jsx': + case 'tsx': + return ; + case 'py': + return ; + case 'json': + case 'yml': + case 'yaml': + case 'xml': + return ; + case 'md': + case 'txt': + return ; + default: + return ; + } }; // Breadcrumb component const Breadcrumb: React.FC<{ - path: string; - onNavigate: (path: string) => void; - onHome: () => void; + path: string; + onNavigate: (path: string) => void; + onHome: () => void; }> = ({ path, onNavigate, onHome }) => { - // Handle both Windows (C:\path) and Unix (/path) style paths - const isWindowsPath = /^[A-Za-z]:/.test(path); - const separator = isWindowsPath ? /[\\/]/ : /\//; - const parts = path.split(separator).filter(Boolean); - - // For Windows, first part might be drive letter like "C:" - const buildPath = (index: number) => { - if (isWindowsPath) { - return parts.slice(0, index + 1).join('\\'); - } - return '/' + parts.slice(0, index + 1).join('/'); - }; - - return ( -
- - - {parts.map((part, idx) => { - const partPath = buildPath(idx); - const isLast = idx === parts.length - 1; - return ( - + // Handle both Windows (C:\path) and Unix (/path) style paths + const isWindowsPath = /^[A-Za-z]:/.test(path); + const separator = isWindowsPath ? /[\\/]/ : /\//; + const parts = path.split(separator).filter(Boolean); + + // For Windows, first part might be drive letter like "C:" + const buildPath = (index: number) => { + if (isWindowsPath) { + return parts.slice(0, index + 1).join('\\'); + } + return '/' + parts.slice(0, index + 1).join('/'); + }; + + return ( +
- {!isLast && } - - ); - })} -
- ); + + {parts.map((part, idx) => { + const partPath = buildPath(idx); + const isLast = idx === parts.length - 1; + return ( + + + {!isLast && } + + ); + })} +
+ ); }; // File row component const FileRow: React.FC<{ - entry: SftpFileEntry; - isSelected: boolean; - isDragOver: boolean; - onSelect: (e: React.MouseEvent) => void; - onOpen: () => void; - onDragStart: (e: React.DragEvent) => void; - onDragEnd: () => void; - onDragOver: (e: React.DragEvent) => void; - onDragLeave: () => void; - onDrop: (e: React.DragEvent) => void; + entry: SftpFileEntry; + isSelected: boolean; + isDragOver: boolean; + onSelect: (e: React.MouseEvent) => void; + onOpen: () => void; + onDragStart: (e: React.DragEvent) => void; + onDragEnd: () => void; + onDragOver: (e: React.DragEvent) => void; + onDragLeave: () => void; + onDrop: (e: React.DragEvent) => void; }> = ({ entry, isSelected, isDragOver, onSelect, onOpen, onDragStart, onDragEnd, onDragOver, onDragLeave, onDrop }) => { - const isParentDir = entry.name === '..'; - - return ( -
-
-
- {entry.type === 'directory' ? : getFileIcon(entry)} + const isParentDir = entry.name === '..'; + + return ( +
+
+
+ {entry.type === 'directory' ? : getFileIcon(entry)} +
+ {entry.name} +
+ {entry.lastModifiedFormatted} + {entry.sizeFormatted} + + {entry.type === 'directory' ? 'folder' : entry.name.split('.').pop()?.toLowerCase() || 'file'} +
- {entry.name} -
- {entry.lastModifiedFormatted} - {entry.sizeFormatted} - - {entry.type === 'directory' ? 'folder' : entry.name.split('.').pop()?.toLowerCase() || 'file'} - -
- ); + ); }; // Transfer item component const TransferItem: React.FC<{ - task: TransferTask; - onCancel: () => void; - onRetry: () => void; - onDismiss: () => void; + task: TransferTask; + onCancel: () => void; + onRetry: () => void; + onDismiss: () => void; }> = ({ task, onCancel, onRetry, onDismiss }) => { - const progress = task.totalBytes > 0 ? (task.transferredBytes / task.totalBytes) * 100 : 0; - const speedFormatted = task.speed > 0 - ? `${(task.speed / 1024).toFixed(1)} KB/s` - : ''; - - const remainingBytes = task.totalBytes - task.transferredBytes; - const remainingTime = task.speed > 0 - ? Math.ceil(remainingBytes / task.speed) - : 0; - const remainingFormatted = remainingTime > 60 - ? `~${Math.ceil(remainingTime / 60)} min remaining` - : remainingTime > 0 - ? `~${remainingTime}s remaining` - : ''; + const progress = task.totalBytes > 0 ? (task.transferredBytes / task.totalBytes) * 100 : 0; + const speedFormatted = task.speed > 0 + ? `${(task.speed / 1024).toFixed(1)} KB/s` + : ''; - return ( -
-
- {task.status === 'transferring' && } - {task.status === 'pending' && } - {task.status === 'completed' && } - {task.status === 'failed' && } - {task.status === 'cancelled' && } -
- -
-
- {task.fileName} - {task.status === 'transferring' && speedFormatted && ( - {speedFormatted} - )} -
- {task.status === 'transferring' && ( -
-
-
-
-
+ const remainingBytes = task.totalBytes - task.transferredBytes; + const remainingTime = task.speed > 0 + ? Math.ceil(remainingBytes / task.speed) + : 0; + const remainingFormatted = remainingTime > 60 + ? `~${Math.ceil(remainingTime / 60)} min remaining` + : remainingTime > 0 + ? `~${remainingTime}s remaining` + : ''; + + return ( +
+
+ {task.status === 'transferring' && } + {task.status === 'pending' && } + {task.status === 'completed' && } + {task.status === 'failed' && } + {task.status === 'cancelled' && }
- {Math.round(progress)}% -
- )} - {task.status === 'failed' && task.error && ( - {task.error} - )} -
-
- {task.status === 'failed' && ( - - )} - {(task.status === 'pending' || task.status === 'transferring') && ( - - )} - {(task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled') && ( - - )} -
-
- ); +
+
+ {task.fileName} + {task.status === 'transferring' && speedFormatted && ( + {speedFormatted} + )} +
+ {task.status === 'transferring' && ( +
+
+
+
+
+
+ {Math.round(progress)}% +
+ )} + {task.status === 'failed' && task.error && ( + {task.error} + )} +
+ +
+ {task.status === 'failed' && ( + + )} + {(task.status === 'pending' || task.status === 'transferring') && ( + + )} + {(task.status === 'completed' || task.status === 'failed' || task.status === 'cancelled') && ( + + )} +
+
+ ); }; // SFTP Pane component const SftpPaneView: React.FC<{ - side: 'left' | 'right'; - pane: SftpPane; - hosts: Host[]; - filteredFiles: SftpFileEntry[]; - onConnect: (host: Host | 'local') => void; - onDisconnect: () => void; - onNavigateTo: (path: string) => void; - onNavigateUp: () => void; - onRefresh: () => void; - onOpenEntry: (entry: SftpFileEntry) => void; - onToggleSelection: (fileName: string, multiSelect: boolean) => void; - onClearSelection: () => void; - onSetFilter: (filter: string) => void; - onCreateDirectory: (name: string) => Promise; - onDeleteFiles: (fileNames: string[]) => Promise; - onRenameFile: (oldName: string, newName: string) => Promise; - onStartTransfer: (files: { name: string; isDirectory: boolean }[]) => void; - onEditPermissions?: (file: SftpFileEntry) => void; - draggedFiles: { name: string; isDirectory: boolean; side: 'left' | 'right' }[] | null; - onDragStart: (files: { name: string; isDirectory: boolean }[], side: 'left' | 'right') => void; - onDragEnd: () => void; + side: 'left' | 'right'; + pane: SftpPane; + hosts: Host[]; + filteredFiles: SftpFileEntry[]; + onConnect: (host: Host | 'local') => void; + onDisconnect: () => void; + onNavigateTo: (path: string) => void; + onNavigateUp: () => void; + onRefresh: () => void; + onOpenEntry: (entry: SftpFileEntry) => void; + onToggleSelection: (fileName: string, multiSelect: boolean) => void; + onClearSelection: () => void; + onSetFilter: (filter: string) => void; + onCreateDirectory: (name: string) => Promise; + onDeleteFiles: (fileNames: string[]) => Promise; + onRenameFile: (oldName: string, newName: string) => Promise; + onStartTransfer: (files: { name: string; isDirectory: boolean }[]) => void; + onEditPermissions?: (file: SftpFileEntry) => void; + draggedFiles: { name: string; isDirectory: boolean; side: 'left' | 'right' }[] | null; + onDragStart: (files: { name: string; isDirectory: boolean }[], side: 'left' | 'right') => void; + onDragEnd: () => void; }> = ({ - side, - pane, - hosts, - filteredFiles, - onConnect, - onDisconnect, - onNavigateTo, - onNavigateUp, - onRefresh, - onOpenEntry, - onToggleSelection, - onClearSelection, - onSetFilter, - onCreateDirectory, - onDeleteFiles, - onRenameFile, - onStartTransfer, - onEditPermissions, - draggedFiles, - onDragStart, - onDragEnd, + side, + pane, + hosts, + filteredFiles, + onConnect, + onDisconnect, + onNavigateTo, + onNavigateUp, + onRefresh, + onOpenEntry, + onToggleSelection, + onClearSelection, + onSetFilter, + onCreateDirectory, + onDeleteFiles, + onRenameFile, + onStartTransfer, + onEditPermissions, + draggedFiles, + onDragStart, + onDragEnd, }) => { - const [showHostPicker, setShowHostPicker] = useState(false); - const [hostSearch, setHostSearch] = useState(''); - const [showNewFolderDialog, setShowNewFolderDialog] = useState(false); - const [newFolderName, setNewFolderName] = useState(''); - const [showRenameDialog, setShowRenameDialog] = useState(false); - const [renameTarget, setRenameTarget] = useState(null); - const [renameName, setRenameName] = useState(''); - const [showDeleteConfirm, setShowDeleteConfirm] = useState(false); - const [deleteTargets, setDeleteTargets] = useState([]); - const [dragOverEntry, setDragOverEntry] = useState(null); - const [isDragOverPane, setIsDragOverPane] = useState(false); - const fileListRef = useRef(null); + const [showHostPicker, setShowHostPicker] = useState(false); + const [hostSearch, setHostSearch] = useState(''); + const [showNewFolderDialog, setShowNewFolderDialog] = useState(false); + const [newFolderName, setNewFolderName] = useState(''); + const [showRenameDialog, setShowRenameDialog] = useState(false); + const [renameTarget, setRenameTarget] = useState(null); + const [renameName, setRenameName] = useState(''); + const [showDeleteConfirm, setShowDeleteConfirm] = useState(false); + const [deleteTargets, setDeleteTargets] = useState([]); + const [dragOverEntry, setDragOverEntry] = useState(null); + const [isDragOverPane, setIsDragOverPane] = useState(false); + const fileListRef = useRef(null); - const filteredHosts = useMemo(() => { - const term = hostSearch.trim().toLowerCase(); - return hosts.filter(h => - !term || - h.label.toLowerCase().includes(term) || - h.hostname.toLowerCase().includes(term) - ).sort((a, b) => a.label.localeCompare(b.label)); - }, [hosts, hostSearch]); + const filteredHosts = useMemo(() => { + const term = hostSearch.trim().toLowerCase(); + return hosts.filter(h => + !term || + h.label.toLowerCase().includes(term) || + h.hostname.toLowerCase().includes(term) + ).sort((a, b) => a.label.localeCompare(b.label)); + }, [hosts, hostSearch]); - // Add parent entry if not at root - const displayFiles = useMemo(() => { - if (!pane.connection) return []; - if (pane.connection.currentPath === '/') return filteredFiles; - const parentEntry: SftpFileEntry = { - name: '..', - type: 'directory', - size: 0, - sizeFormatted: '--', - lastModified: 0, - lastModifiedFormatted: '--', - }; - return [parentEntry, ...filteredFiles.filter(f => f.name !== '..')]; - }, [pane.connection, filteredFiles]); + // Add parent entry if not at root + const displayFiles = useMemo(() => { + if (!pane.connection) return []; + if (pane.connection.currentPath === '/') return filteredFiles; + const parentEntry: SftpFileEntry = { + name: '..', + type: 'directory', + size: 0, + sizeFormatted: '--', + lastModified: 0, + lastModifiedFormatted: '--', + }; + return [parentEntry, ...filteredFiles.filter(f => f.name !== '..')]; + }, [pane.connection, filteredFiles]); - const handleCreateFolder = async () => { - if (!newFolderName.trim()) return; - try { - await onCreateDirectory(newFolderName.trim()); - setShowNewFolderDialog(false); - setNewFolderName(''); - } catch (err) { - // Error handling - } - }; + const handleCreateFolder = async () => { + if (!newFolderName.trim()) return; + try { + await onCreateDirectory(newFolderName.trim()); + setShowNewFolderDialog(false); + setNewFolderName(''); + } catch (err) { + // Error handling + } + }; - const handleRename = async () => { - if (!renameTarget || !renameName.trim()) return; - try { - await onRenameFile(renameTarget, renameName.trim()); - setShowRenameDialog(false); - setRenameTarget(null); - setRenameName(''); - } catch (err) { - // Error handling - } - }; + const handleRename = async () => { + if (!renameTarget || !renameName.trim()) return; + try { + await onRenameFile(renameTarget, renameName.trim()); + setShowRenameDialog(false); + setRenameTarget(null); + setRenameName(''); + } catch (err) { + // Error handling + } + }; - const handleDelete = async () => { - if (deleteTargets.length === 0) return; - try { - await onDeleteFiles(deleteTargets); - setShowDeleteConfirm(false); - setDeleteTargets([]); - onClearSelection(); - } catch (err) { - // Error handling - } - }; + const handleDelete = async () => { + if (deleteTargets.length === 0) return; + try { + await onDeleteFiles(deleteTargets); + setShowDeleteConfirm(false); + setDeleteTargets([]); + onClearSelection(); + } catch (err) { + // Error handling + } + }; - const handlePaneDragOver = (e: React.DragEvent) => { - if (!draggedFiles || draggedFiles[0]?.side === side) return; - e.preventDefault(); - e.dataTransfer.dropEffect = 'copy'; - setIsDragOverPane(true); - }; + const handlePaneDragOver = (e: React.DragEvent) => { + if (!draggedFiles || draggedFiles[0]?.side === side) return; + e.preventDefault(); + e.dataTransfer.dropEffect = 'copy'; + setIsDragOverPane(true); + }; - const handlePaneDragLeave = (e: React.DragEvent) => { - if (!fileListRef.current?.contains(e.relatedTarget as Node)) { - setIsDragOverPane(false); - } - }; + const handlePaneDragLeave = (e: React.DragEvent) => { + if (!fileListRef.current?.contains(e.relatedTarget as Node)) { + setIsDragOverPane(false); + } + }; - const handlePaneDrop = (e: React.DragEvent) => { - e.preventDefault(); - setIsDragOverPane(false); - setDragOverEntry(null); - - if (!draggedFiles || draggedFiles[0]?.side === side) return; - onStartTransfer(draggedFiles.map(f => ({ name: f.name, isDirectory: f.isDirectory }))); - }; + const handlePaneDrop = (e: React.DragEvent) => { + e.preventDefault(); + setIsDragOverPane(false); + setDragOverEntry(null); - const handleFileDragStart = (entry: SftpFileEntry, e: React.DragEvent) => { - if (entry.name === '..') { - e.preventDefault(); - return; - } - - const selectedNames = Array.from(pane.selectedFiles); - const files = selectedNames.includes(entry.name) - ? displayFiles.filter(f => selectedNames.includes(f.name)).map(f => ({ - name: f.name, - isDirectory: f.type === 'directory', - side, - })) - : [{ name: entry.name, isDirectory: entry.type === 'directory', side }]; - - e.dataTransfer.effectAllowed = 'copy'; - e.dataTransfer.setData('text/plain', files.map(f => f.name).join('\n')); - onDragStart(files, side); - }; + if (!draggedFiles || draggedFiles[0]?.side === side) return; + onStartTransfer(draggedFiles.map(f => ({ name: f.name, isDirectory: f.isDirectory }))); + }; - const handleEntryDragOver = (entry: SftpFileEntry, e: React.DragEvent) => { - if (!draggedFiles || draggedFiles[0]?.side === side) return; - if (entry.type !== 'directory' || entry.name === '..') return; - - e.preventDefault(); - e.stopPropagation(); - setDragOverEntry(entry.name); - }; + const handleFileDragStart = (entry: SftpFileEntry, e: React.DragEvent) => { + if (entry.name === '..') { + e.preventDefault(); + return; + } - const handleEntryDrop = (entry: SftpFileEntry, e: React.DragEvent) => { - e.preventDefault(); - e.stopPropagation(); - setDragOverEntry(null); - setIsDragOverPane(false); - - if (!draggedFiles || draggedFiles[0]?.side === side) return; - if (entry.type !== 'directory') return; - - // Navigate to directory first, then transfer - // For now, just transfer to current directory - onStartTransfer(draggedFiles.map(f => ({ name: f.name, isDirectory: f.isDirectory }))); - }; + const selectedNames = Array.from(pane.selectedFiles); + const files = selectedNames.includes(entry.name) + ? displayFiles.filter(f => selectedNames.includes(f.name)).map(f => ({ + name: f.name, + isDirectory: f.type === 'directory', + side, + })) + : [{ name: entry.name, isDirectory: entry.type === 'directory', side }]; - const openRenameDialog = (name: string) => { - setRenameTarget(name); - setRenameName(name); - setShowRenameDialog(true); - }; + e.dataTransfer.effectAllowed = 'copy'; + e.dataTransfer.setData('text/plain', files.map(f => f.name).join('\n')); + onDragStart(files, side); + }; - const openDeleteConfirm = (names: string[]) => { - setDeleteTargets(names); - setShowDeleteConfirm(true); - }; + const handleEntryDragOver = (entry: SftpFileEntry, e: React.DragEvent) => { + if (!draggedFiles || draggedFiles[0]?.side === side) return; + if (entry.type !== 'directory' || entry.name === '..') return; - if (!pane.connection) { - return ( -
-
-
- {side === 'left' ? : } - {side === 'left' ? 'Local' : 'Remote'} -
- -
- -
-
- {side === 'left' ? : } -
-
-
Select a host to start
-
- Choose a local or remote filesystem to browse -
-
- -
+ e.preventDefault(); + e.stopPropagation(); + setDragOverEntry(entry.name); + }; - {/* Host picker dialog */} - - - - Select Host - - Pick a host for the {side} pane - - -
- setHostSearch(e.target.value)} - placeholder="Search hosts..." - className="h-9" - /> - - {/* Local option */} -
{ onConnect('local'); setShowHostPicker(false); }} - > -
-
- -
-
-
Local filesystem
-
Browse local files
-
-
- Local -
+ const handleEntryDrop = (entry: SftpFileEntry, e: React.DragEvent) => { + e.preventDefault(); + e.stopPropagation(); + setDragOverEntry(null); + setIsDragOverPane(false); - {/* Remote hosts */} -
- {filteredHosts.map(host => ( -
{ onConnect(host); setShowHostPicker(false); }} - > -
- -
-
{host.label}
-
- {host.username}@{host.hostname} + if (!draggedFiles || draggedFiles[0]?.side === side) return; + if (entry.type !== 'directory') return; + + // Navigate to directory first, then transfer + // For now, just transfer to current directory + onStartTransfer(draggedFiles.map(f => ({ name: f.name, isDirectory: f.isDirectory }))); + }; + + const openRenameDialog = (name: string) => { + setRenameTarget(name); + setRenameName(name); + setShowRenameDialog(true); + }; + + const openDeleteConfirm = (names: string[]) => { + setDeleteTargets(names); + setShowDeleteConfirm(true); + }; + + if (!pane.connection) { + return ( +
+
+
+ {side === 'left' ? : } + {side === 'left' ? 'Local' : 'Remote'}
-
+
- - SSH - -
- ))} - {filteredHosts.length === 0 && ( -
- No matching hosts -
- )} -
-
- -
-
- ); - } - return ( -
- {/* Header */} -
-
- {pane.connection.isLocal ? : } - {pane.connection.hostLabel} - {pane.connection.status === 'connecting' && ( - - )} - {pane.connection.status === 'error' && ( - - )} -
- - +
+
+ {side === 'left' ? : } +
+
+
Select a host to start
+
+ Choose a local or remote filesystem to browse +
+
+ +
-
-
- - onSetFilter(e.target.value)} - placeholder="Filter..." - className="h-8 w-36 pl-8 pr-7 text-xs bg-secondary/40" - /> - {pane.filter && ( - - )} -
- -
-
+ {/* Host picker dialog */} + + + + Select Host + + Pick a host for the {side} pane + + +
+ setHostSearch(e.target.value)} + placeholder="Search hosts..." + className="h-9" + /> - {/* Toolbar */} -
- - pane.connection?.homeDir && onNavigateTo(pane.connection.homeDir)} - /> -
- -
-
+ {/* Local option */} +
{ onConnect('local'); setShowHostPicker(false); }} + > +
+
+ +
+
+
Local filesystem
+
Browse local files
+
+
+ Local +
- {/* File list header */} -
- Name - Modified - Size - Kind -
+ {/* Remote hosts */} +
+ {filteredHosts.map(host => ( +
{ onConnect(host); setShowHostPicker(false); }} + > +
+ +
+
{host.label}
+
+ {host.username}@{host.hostname} +
+
+
+ + SSH + +
+ ))} + {filteredHosts.length === 0 && ( +
+ No matching hosts +
+ )} +
+
+
+
+
+ ); + } - {/* File list */} -
- {pane.loading && displayFiles.length === 0 ? ( -
- -
- ) : pane.error ? ( -
- - {pane.error} - -
- ) : displayFiles.length === 0 ? ( -
- - Empty directory -
- ) : ( -
- {displayFiles.map((entry, idx) => ( - - - { - if (entry.name === '..') return; - onToggleSelection(entry.name, e.ctrlKey || e.metaKey); - }} - onOpen={() => onOpenEntry(entry)} - onDragStart={(e) => handleFileDragStart(entry, e)} - onDragEnd={onDragEnd} - onDragOver={(e) => handleEntryDragOver(entry, e)} - onDragLeave={() => setDragOverEntry(null)} - onDrop={(e) => handleEntryDrop(entry, e)} - /> - - {entry.name !== '..' && ( - - onOpenEntry(entry)}> - {entry.type === 'directory' ? 'Open' : 'Download'} - - - { - const files = pane.selectedFiles.has(entry.name) - ? Array.from(pane.selectedFiles) - : [entry.name]; - const fileData = files.map(name => { - const file = displayFiles.find(f => f.name === name); - return { name, isDirectory: file?.type === 'directory' || false }; - }); - onStartTransfer(fileData); - }}> - Copy to other pane - - - openRenameDialog(entry.name)}> - Rename - - {onEditPermissions && pane.connection && !pane.connection.isLocal && ( - onEditPermissions(entry)}> - Permissions - - )} - { - const files = pane.selectedFiles.has(entry.name) - ? Array.from(pane.selectedFiles) - : [entry.name]; - openDeleteConfirm(files); - }} - > - Delete - - - - Refresh - - setShowNewFolderDialog(true)}> - New Folder - - - )} - - ))} -
- )} - - {/* Drop overlay */} - {isDragOverPane && draggedFiles && draggedFiles[0]?.side !== side && ( -
-
- - Drop files here -
-
- )} -
- - {/* Footer - pinned at bottom */} -
- - {displayFiles.filter(f => f.name !== '..').length} items - {pane.selectedFiles.size > 0 && ` • ${pane.selectedFiles.size} selected`} - - {pane.connection.currentPath} -
- - {/* New folder dialog */} - - - - New Folder - -
-
- - setNewFolderName(e.target.value)} - placeholder="Enter folder name" - onKeyDown={e => e.key === 'Enter' && handleCreateFolder()} - autoFocus - /> -
-
- - - - -
-
- - {/* Rename dialog */} - - - - Rename - -
-
- - setRenameName(e.target.value)} - placeholder="Enter new name" - onKeyDown={e => e.key === 'Enter' && handleRename()} - autoFocus - /> -
-
- - - - -
-
- - {/* Delete confirmation */} - - - - Delete {deleteTargets.length} item{deleteTargets.length > 1 ? 's' : ''}? - - This action cannot be undone. The following will be deleted: - - -
- {deleteTargets.map(name => ( -
- - {name} -
- ))} -
- - - - -
-
- - {/* Host picker */} - - - - Select Host - - Pick a host for the {side} pane - - -
- setHostSearch(e.target.value)} - placeholder="Search hosts..." - className="h-9" - /> - + return (
{ onDisconnect(); onConnect('local'); setShowHostPicker(false); }} + className={cn( + "absolute inset-0 flex flex-col transition-colors", + isDragOverPane && "bg-primary/5" + )} + onDragOver={handlePaneDragOver} + onDragLeave={handlePaneDragLeave} + onDrop={handlePaneDrop} > -
-
- -
-
-
Local filesystem
-
Browse local files
-
-
- Local -
+ {/* Header */} +
+
+ {pane.connection.isLocal ? : } + {pane.connection.hostLabel} + {pane.connection.status === 'connecting' && ( + + )} + {pane.connection.status === 'error' && ( + + )} +
-
- {filteredHosts.map(host => ( -
{ onDisconnect(); onConnect(host); setShowHostPicker(false); }} - > -
- -
-
{host.label}
-
- {host.username}@{host.hostname} -
+ + +
+
+ + onSetFilter(e.target.value)} + placeholder="Filter..." + className="h-8 w-36 pl-8 pr-7 text-xs bg-secondary/40" + /> + {pane.filter && ( + + )} +
+
-
- - SSH -
- ))} + + {/* Toolbar */} +
+ + pane.connection?.homeDir && onNavigateTo(pane.connection.homeDir)} + /> +
+ +
+
+ + {/* File list header */} +
+ Name + Modified + Size + Kind +
+ + {/* File list */} +
+ {pane.loading && displayFiles.length === 0 ? ( +
+ +
+ ) : pane.error ? ( +
+ + {pane.error} + +
+ ) : displayFiles.length === 0 ? ( +
+ + Empty directory +
+ ) : ( +
+ {displayFiles.map((entry, idx) => ( + + + { + if (entry.name === '..') return; + onToggleSelection(entry.name, e.ctrlKey || e.metaKey); + }} + onOpen={() => onOpenEntry(entry)} + onDragStart={(e) => handleFileDragStart(entry, e)} + onDragEnd={onDragEnd} + onDragOver={(e) => handleEntryDragOver(entry, e)} + onDragLeave={() => setDragOverEntry(null)} + onDrop={(e) => handleEntryDrop(entry, e)} + /> + + {entry.name !== '..' && ( + + onOpenEntry(entry)}> + {entry.type === 'directory' ? 'Open' : 'Download'} + + + { + const files = pane.selectedFiles.has(entry.name) + ? Array.from(pane.selectedFiles) + : [entry.name]; + const fileData = files.map(name => { + const file = displayFiles.find(f => f.name === name); + return { name, isDirectory: file?.type === 'directory' || false }; + }); + onStartTransfer(fileData); + }}> + Copy to other pane + + + openRenameDialog(entry.name)}> + Rename + + {onEditPermissions && pane.connection && !pane.connection.isLocal && ( + onEditPermissions(entry)}> + Permissions + + )} + { + const files = pane.selectedFiles.has(entry.name) + ? Array.from(pane.selectedFiles) + : [entry.name]; + openDeleteConfirm(files); + }} + > + Delete + + + + Refresh + + setShowNewFolderDialog(true)}> + New Folder + + + )} + + ))} +
+ )} + + {/* Drop overlay */} + {isDragOverPane && draggedFiles && draggedFiles[0]?.side !== side && ( +
+
+ + Drop files here +
+
+ )} +
+ + {/* Footer - pinned at bottom */} +
+ + {displayFiles.filter(f => f.name !== '..').length} items + {pane.selectedFiles.size > 0 && ` • ${pane.selectedFiles.size} selected`} + + {pane.connection.currentPath} +
+ + {/* New folder dialog */} + + + + New Folder + +
+
+ + setNewFolderName(e.target.value)} + placeholder="Enter folder name" + onKeyDown={e => e.key === 'Enter' && handleCreateFolder()} + autoFocus + /> +
+
+ + + + +
+
+ + {/* Rename dialog */} + + + + Rename + +
+
+ + setRenameName(e.target.value)} + placeholder="Enter new name" + onKeyDown={e => e.key === 'Enter' && handleRename()} + autoFocus + /> +
+
+ + + + +
+
+ + {/* Delete confirmation */} + + + + Delete {deleteTargets.length} item{deleteTargets.length > 1 ? 's' : ''}? + + This action cannot be undone. The following will be deleted: + + +
+ {deleteTargets.map(name => ( +
+ + {name} +
+ ))} +
+ + + + +
+
+ + {/* Host picker */} + + + + Select Host + + Pick a host for the {side} pane + + +
+ setHostSearch(e.target.value)} + placeholder="Search hosts..." + className="h-9" + /> + +
{ onDisconnect(); onConnect('local'); setShowHostPicker(false); }} + > +
+
+ +
+
+
Local filesystem
+
Browse local files
+
+
+ Local +
+ +
+ {filteredHosts.map(host => ( +
{ onDisconnect(); onConnect(host); setShowHostPicker(false); }} + > +
+ +
+
{host.label}
+
+ {host.username}@{host.hostname} +
+
+
+ + SSH + +
+ ))} +
+
+
+
-
- -
-
- ); -}; + ); + }; // Conflict Resolution Dialog interface ConflictDialogProps { - conflicts: { transferId: string; fileName: string; sourcePath: string; targetPath: string; existingSize: number; newSize: number; existingModified: number; newModified: number; }[]; - onResolve: (conflictId: string, action: 'replace' | 'skip' | 'duplicate') => void; - formatFileSize: (size: number) => string; + conflicts: { transferId: string; fileName: string; sourcePath: string; targetPath: string; existingSize: number; newSize: number; existingModified: number; newModified: number; }[]; + onResolve: (conflictId: string, action: 'replace' | 'skip' | 'duplicate') => void; + formatFileSize: (size: number) => string; } const ConflictDialog: React.FC = ({ conflicts, onResolve, formatFileSize }) => { - const [applyToAll, setApplyToAll] = useState(false); - const conflict = conflicts[0]; // Handle first conflict - - if (!conflict) return null; + const [applyToAll, setApplyToAll] = useState(false); + const conflict = conflicts[0]; // Handle first conflict - const formatDate = (timestamp: number) => { - return new Date(timestamp).toLocaleString(); - }; + if (!conflict) return null; - const handleAction = (action: 'replace' | 'skip' | 'duplicate') => { - if (applyToAll) { - // Apply to all conflicts - conflicts.forEach(c => onResolve(c.transferId, action)); - } else { - onResolve(conflict.transferId, action); - } - setApplyToAll(false); - }; + const formatDate = (timestamp: number) => { + return new Date(timestamp).toLocaleString(); + }; - return ( - handleAction('skip')}> - - - - - File Conflict - - - A file with the same name already exists at the destination - - - -
-
- {conflict.fileName} - already exists -
- -
-
-
Existing file
-
-
- Size: - {formatFileSize(conflict.existingSize)} + const handleAction = (action: 'replace' | 'skip' | 'duplicate') => { + if (applyToAll) { + // Apply to all conflicts + conflicts.forEach(c => onResolve(c.transferId, action)); + } else { + onResolve(conflict.transferId, action); + } + setApplyToAll(false); + }; + + return ( + handleAction('skip')}> + + + + + File Conflict + + + A file with the same name already exists at the destination + + + +
+
+ {conflict.fileName} + already exists +
+ +
+
+
Existing file
+
+
+ Size: + {formatFileSize(conflict.existingSize)} +
+
+ Modified: + {formatDate(conflict.existingModified)} +
+
+
+ +
+
New file
+
+
+ Size: + {formatFileSize(conflict.newSize)} +
+
+ Modified: + {formatDate(conflict.newModified)} +
+
+
+
+ + {conflicts.length > 1 && ( + + )}
-
- Modified: - {formatDate(conflict.existingModified)} -
-
-
- -
-
New file
-
-
- Size: - {formatFileSize(conflict.newSize)} -
-
- Modified: - {formatDate(conflict.newModified)} -
-
-
-
- - {conflicts.length > 1 && ( - - )} -
- - - - - - - -
- ); + + + + + + + + + ); }; // Permissions Editor Dialog interface PermissionsDialogProps { - open: boolean; - onOpenChange: (open: boolean) => void; - file: SftpFileEntry | null; - onSave: (file: SftpFileEntry, permissions: string) => void; + open: boolean; + onOpenChange: (open: boolean) => void; + file: SftpFileEntry | null; + onSave: (file: SftpFileEntry, permissions: string) => void; } const PermissionsDialog: React.FC = ({ open, onOpenChange, file, onSave }) => { - const [permissions, setPermissions] = useState({ - owner: { read: false, write: false, execute: false }, - group: { read: false, write: false, execute: false }, - others: { read: false, write: false, execute: false }, - }); + const [permissions, setPermissions] = useState({ + owner: { read: false, write: false, execute: false }, + group: { read: false, write: false, execute: false }, + others: { read: false, write: false, execute: false }, + }); - // Parse permissions from file - useEffect(() => { - if (file?.permissions) { - const perms = file.permissions; - // Parse rwxrwxrwx format (skip first char for type) - const pStr = perms.length === 10 ? perms.slice(1) : perms; - if (pStr.length >= 9) { - setPermissions({ - owner: { - read: pStr[0] === 'r', - write: pStr[1] === 'w', - execute: pStr[2] === 'x' || pStr[2] === 's', - }, - group: { - read: pStr[3] === 'r', - write: pStr[4] === 'w', - execute: pStr[5] === 'x' || pStr[5] === 's', - }, - others: { - read: pStr[6] === 'r', - write: pStr[7] === 'w', - execute: pStr[8] === 'x' || pStr[8] === 't', - }, - }); - } - } - }, [file]); + // Parse permissions from file + useEffect(() => { + if (file?.permissions) { + const perms = file.permissions; + // Parse rwxrwxrwx format (skip first char for type) + const pStr = perms.length === 10 ? perms.slice(1) : perms; + if (pStr.length >= 9) { + setPermissions({ + owner: { + read: pStr[0] === 'r', + write: pStr[1] === 'w', + execute: pStr[2] === 'x' || pStr[2] === 's', + }, + group: { + read: pStr[3] === 'r', + write: pStr[4] === 'w', + execute: pStr[5] === 'x' || pStr[5] === 's', + }, + others: { + read: pStr[6] === 'r', + write: pStr[7] === 'w', + execute: pStr[8] === 'x' || pStr[8] === 't', + }, + }); + } + } + }, [file]); - const togglePerm = (role: 'owner' | 'group' | 'others', perm: 'read' | 'write' | 'execute') => { - setPermissions(prev => ({ - ...prev, - [role]: { ...prev[role], [perm]: !prev[role][perm] } - })); - }; + const togglePerm = (role: 'owner' | 'group' | 'others', perm: 'read' | 'write' | 'execute') => { + setPermissions(prev => ({ + ...prev, + [role]: { ...prev[role], [perm]: !prev[role][perm] } + })); + }; - const getOctalPermissions = (): string => { - const getNum = (p: { read: boolean; write: boolean; execute: boolean }) => - (p.read ? 4 : 0) + (p.write ? 2 : 0) + (p.execute ? 1 : 0); - return `${getNum(permissions.owner)}${getNum(permissions.group)}${getNum(permissions.others)}`; - }; + const getOctalPermissions = (): string => { + const getNum = (p: { read: boolean; write: boolean; execute: boolean }) => + (p.read ? 4 : 0) + (p.write ? 2 : 0) + (p.execute ? 1 : 0); + return `${getNum(permissions.owner)}${getNum(permissions.group)}${getNum(permissions.others)}`; + }; - const getSymbolicPermissions = (): string => { - const getSym = (p: { read: boolean; write: boolean; execute: boolean }) => - `${p.read ? 'r' : '-'}${p.write ? 'w' : '-'}${p.execute ? 'x' : '-'}`; - return getSym(permissions.owner) + getSym(permissions.group) + getSym(permissions.others); - }; + const getSymbolicPermissions = (): string => { + const getSym = (p: { read: boolean; write: boolean; execute: boolean }) => + `${p.read ? 'r' : '-'}${p.write ? 'w' : '-'}${p.execute ? 'x' : '-'}`; + return getSym(permissions.owner) + getSym(permissions.group) + getSym(permissions.others); + }; - const handleSave = () => { - if (file) { - onSave(file, getOctalPermissions()); - onOpenChange(false); - } - }; + const handleSave = () => { + if (file) { + onSave(file, getOctalPermissions()); + onOpenChange(false); + } + }; - if (!file) return null; + if (!file) return null; - const PermRow = ({ role, label }: { role: 'owner' | 'group' | 'others'; label: string }) => ( -
-
{label}
-
- {(['read', 'write', 'execute'] as const).map(perm => ( - - ))} -
-
- ); - - return ( - - - - Edit Permissions - - {file.name} - - - -
-
- - - -
- -
-
- Octal: {getOctalPermissions()} + const PermRow = ({ role, label }: { role: 'owner' | 'group' | 'others'; label: string }) => ( +
+
{label}
+
+ {(['read', 'write', 'execute'] as const).map(perm => ( + + ))}
-
- Symbolic: {getSymbolicPermissions()} -
-
- - - - - - -
- ); + ); + + return ( + + + + Edit Permissions + + {file.name} + + + +
+
+ + + +
+ +
+
+ Octal: {getOctalPermissions()} +
+
+ Symbolic: {getSymbolicPermissions()} +
+
+
+ + + + + +
+
+ ); }; // Main SftpView component interface SftpViewProps { - hosts: Host[]; - keys: SSHKey[]; - isActive: boolean; + hosts: Host[]; + keys: SSHKey[]; + isActive: boolean; } export const SftpView: React.FC = ({ hosts, keys, isActive }) => { - const sftp = useSftpState(hosts, keys); - const [permissionsState, setPermissionsState] = useState<{ file: SftpFileEntry; side: 'left' | 'right' } | null>(null); - const [draggedFiles, setDraggedFiles] = useState<{ name: string; isDirectory: boolean; side: 'left' | 'right' }[] | null>(null); + const sftp = useSftpState(hosts, keys); + const [permissionsState, setPermissionsState] = useState<{ file: SftpFileEntry; side: 'left' | 'right' } | null>(null); + const [draggedFiles, setDraggedFiles] = useState<{ name: string; isDirectory: boolean; side: 'left' | 'right' }[] | null>(null); - const leftFilteredFiles = useMemo(() => sftp.getFilteredFiles(sftp.leftPane), [sftp.leftPane]); - const rightFilteredFiles = useMemo(() => sftp.getFilteredFiles(sftp.rightPane), [sftp.rightPane]); + const leftFilteredFiles = useMemo(() => sftp.getFilteredFiles(sftp.leftPane), [sftp.leftPane]); + const rightFilteredFiles = useMemo(() => sftp.getFilteredFiles(sftp.rightPane), [sftp.rightPane]); - const handleDragStart = (files: { name: string; isDirectory: boolean }[], side: 'left' | 'right') => { - setDraggedFiles(files.map(f => ({ ...f, side }))); - }; + const handleDragStart = (files: { name: string; isDirectory: boolean }[], side: 'left' | 'right') => { + setDraggedFiles(files.map(f => ({ ...f, side }))); + }; - const handleDragEnd = () => { - setDraggedFiles(null); - }; + const handleDragEnd = () => { + setDraggedFiles(null); + }; - const handleStartTransfer = (sourceSide: 'left' | 'right') => (files: { name: string; isDirectory: boolean }[]) => { - const targetSide = sourceSide === 'left' ? 'right' : 'left'; - sftp.startTransfer(files, sourceSide, targetSide); - }; + const handleStartTransfer = (sourceSide: 'left' | 'right') => (files: { name: string; isDirectory: boolean }[]) => { + const targetSide = sourceSide === 'left' ? 'right' : 'left'; + sftp.startTransfer(files, sourceSide, targetSide); + }; - // Show transfer queue - const visibleTransfers = sftp.transfers.slice(-5); // Show last 5 transfers + // Show transfer queue + const visibleTransfers = sftp.transfers.slice(-5); // Show last 5 transfers - return ( -
- {/* Main content */} -
- {/* Left pane */} -
- sftp.connect('left', host)} - onDisconnect={() => sftp.disconnect('left')} - onNavigateTo={(path) => sftp.navigateTo('left', path)} - onNavigateUp={() => sftp.navigateUp('left')} - onRefresh={() => sftp.refresh('left')} - onOpenEntry={(entry) => sftp.openEntry('left', entry)} - onToggleSelection={(name, multi) => sftp.toggleSelection('left', name, multi)} - onClearSelection={() => sftp.clearSelection('left')} - onSetFilter={(filter) => sftp.setFilter('left', filter)} - onCreateDirectory={(name) => sftp.createDirectory('left', name)} - onDeleteFiles={(names) => sftp.deleteFiles('left', names)} - onRenameFile={(old, newName) => sftp.renameFile('left', old, newName)} - onStartTransfer={handleStartTransfer('left')} - onEditPermissions={(file) => setPermissionsState({ file, side: 'left' })} - draggedFiles={draggedFiles} - onDragStart={handleDragStart} - onDragEnd={handleDragEnd} - /> -
+ return ( +
+ {/* Main content */} +
+ {/* Left pane */} +
+ sftp.connect('left', host)} + onDisconnect={() => sftp.disconnect('left')} + onNavigateTo={(path) => sftp.navigateTo('left', path)} + onNavigateUp={() => sftp.navigateUp('left')} + onRefresh={() => sftp.refresh('left')} + onOpenEntry={(entry) => sftp.openEntry('left', entry)} + onToggleSelection={(name, multi) => sftp.toggleSelection('left', name, multi)} + onClearSelection={() => sftp.clearSelection('left')} + onSetFilter={(filter) => sftp.setFilter('left', filter)} + onCreateDirectory={(name) => sftp.createDirectory('left', name)} + onDeleteFiles={(names) => sftp.deleteFiles('left', names)} + onRenameFile={(old, newName) => sftp.renameFile('left', old, newName)} + onStartTransfer={handleStartTransfer('left')} + onEditPermissions={(file) => setPermissionsState({ file, side: 'left' })} + draggedFiles={draggedFiles} + onDragStart={handleDragStart} + onDragEnd={handleDragEnd} + /> +
- {/* Right pane */} -
- sftp.connect('right', host)} - onDisconnect={() => sftp.disconnect('right')} - onNavigateTo={(path) => sftp.navigateTo('right', path)} - onNavigateUp={() => sftp.navigateUp('right')} - onRefresh={() => sftp.refresh('right')} - onOpenEntry={(entry) => sftp.openEntry('right', entry)} - onToggleSelection={(name, multi) => sftp.toggleSelection('right', name, multi)} - onClearSelection={() => sftp.clearSelection('right')} - onSetFilter={(filter) => sftp.setFilter('right', filter)} - onCreateDirectory={(name) => sftp.createDirectory('right', name)} - onDeleteFiles={(names) => sftp.deleteFiles('right', names)} - onRenameFile={(old, newName) => sftp.renameFile('right', old, newName)} - onStartTransfer={handleStartTransfer('right')} - onEditPermissions={(file) => setPermissionsState({ file, side: 'right' })} - draggedFiles={draggedFiles} - onDragStart={handleDragStart} - onDragEnd={handleDragEnd} - /> -
-
+ {/* Right pane */} +
+ sftp.connect('right', host)} + onDisconnect={() => sftp.disconnect('right')} + onNavigateTo={(path) => sftp.navigateTo('right', path)} + onNavigateUp={() => sftp.navigateUp('right')} + onRefresh={() => sftp.refresh('right')} + onOpenEntry={(entry) => sftp.openEntry('right', entry)} + onToggleSelection={(name, multi) => sftp.toggleSelection('right', name, multi)} + onClearSelection={() => sftp.clearSelection('right')} + onSetFilter={(filter) => sftp.setFilter('right', filter)} + onCreateDirectory={(name) => sftp.createDirectory('right', name)} + onDeleteFiles={(names) => sftp.deleteFiles('right', names)} + onRenameFile={(old, newName) => sftp.renameFile('right', old, newName)} + onStartTransfer={handleStartTransfer('right')} + onEditPermissions={(file) => setPermissionsState({ file, side: 'right' })} + draggedFiles={draggedFiles} + onDragStart={handleDragStart} + onDragEnd={handleDragEnd} + /> +
+
- {/* Transfer queue */} - {sftp.transfers.length > 0 && ( -
-
- - Transfers - {sftp.activeTransfersCount > 0 && ( - ({sftp.activeTransfersCount} active) - )} - - {sftp.transfers.some(t => t.status === 'completed' || t.status === 'cancelled') && ( - + {/* Transfer queue */} + {sftp.transfers.length > 0 && ( +
+
+ + Transfers + {sftp.activeTransfersCount > 0 && ( + ({sftp.activeTransfersCount} active) + )} + + {sftp.transfers.some(t => t.status === 'completed' || t.status === 'cancelled') && ( + + )} +
+
+ {visibleTransfers.map(task => ( + sftp.cancelTransfer(task.id)} + onRetry={() => sftp.retryTransfer(task.id)} + onDismiss={() => sftp.dismissTransfer(task.id)} + /> + ))} +
+
)} -
-
- {visibleTransfers.map(task => ( - sftp.cancelTransfer(task.id)} - onRetry={() => sftp.retryTransfer(task.id)} - onDismiss={() => sftp.dismissTransfer(task.id)} - /> - ))} -
+ + {/* Conflict Resolution Dialog */} + + + {/* Permissions Dialog */} + !open && setPermissionsState(null)} + file={permissionsState?.file ?? null} + onSave={(file, permissions) => { + if (permissionsState) { + const fullPath = sftp.joinPath( + permissionsState.side === 'left' + ? sftp.leftPane.connection?.currentPath || '' + : sftp.rightPane.connection?.currentPath || '', + file.name + ); + sftp.changePermissions(permissionsState.side, fullPath, permissions); + } + setPermissionsState(null); + }} + />
- )} - - {/* Conflict Resolution Dialog */} - - - {/* Permissions Dialog */} - !open && setPermissionsState(null)} - file={permissionsState?.file ?? null} - onSave={(file, permissions) => { - if (permissionsState) { - const fullPath = sftp.joinPath( - permissionsState.side === 'left' - ? sftp.leftPane.connection?.currentPath || '' - : sftp.rightPane.connection?.currentPath || '', - file.name - ); - sftp.changePermissions(permissionsState.side, fullPath, permissions); - } - setPermissionsState(null); - }} - /> -
- ); + ); };