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 */}
-