dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

FIx frontend old confige editor paths

Browse Source
This commit is contained in:
LukeGus
2025-08-17 19:23:33 -05:00
parent cf945e3665
commit 7d904c4a2c
23 changed files with 118 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/Navigation/AppView.tsx
View File

@@ -17,7 +17,7 @@ export function AppView({ isTopbarOpen = true }: TerminalViewProps): React.React
const {tabs, currentTab, allSplitScreenTab} = useTabs() as any;
const { state: sidebarState } = useSidebar();
const terminalTabs = tabs.filter((tab: any) => tab.type === 'terminal' || tab.type === 'server' || tab.type === 'config');
const terminalTabs = tabs.filter((tab: any) => tab.type === 'terminal' || tab.type === 'server' || tab.type === 'file_manager');
const containerRef = useRef<HTMLDivElement | null>(null);
const panelRefs = useRef<Record<string, HTMLDivElement | null>>({});

2
src/ui/Navigation/Hosts/FolderCard.tsx
View File

@@ -21,7 +21,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;

2
src/ui/Navigation/Hosts/Host.tsx
View File

@@ -22,7 +22,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;

2
src/ui/Navigation/LeftSidebar.tsx
View File

@@ -67,7 +67,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;

8
src/ui/Navigation/Tabs/Tab.tsx
View File

@@ -31,9 +31,9 @@ export function Tab({tabType, title, isActive, onActivate, onClose, onSplit, can
);
}
if (tabType === "terminal" || tabType === "server" || tabType === "config") {
if (tabType === "terminal" || tabType === "server" || tabType === "file_manager") {
const isServer = tabType === 'server';
const isConfig = tabType === 'config';
const isFileManager = tabType === 'file_manager';
return (
<ButtonGroup>
<Button
@@ -42,8 +42,8 @@ export function Tab({tabType, title, isActive, onActivate, onClose, onSplit, can
onClick={onActivate}
disabled={disableActivate}
>
{isServer ? <ServerIcon className="mr-1 h-4 w-4"/> : isConfig ? <FolderIcon className="mr-1 h-4 w-4"/> : <TerminalIcon className="mr-1 h-4 w-4"/>}
{title || (isServer ? 'Server' : isConfig ? 'Config' : 'Terminal')}
{isServer ? <ServerIcon className="mr-1 h-4 w-4"/> : isFileManager ? <FolderIcon className="mr-1 h-4 w-4"/> : <TerminalIcon className="mr-1 h-4 w-4"/>}
{title || (isServer ? 'Server' : isFileManager ? 'file_manager' : 'Terminal')}
</Button>
{canSplit && (
<Button

6
src/ui/Navigation/Tabs/TabContext.tsx
View File

@@ -2,7 +2,7 @@ import React, { createContext, useContext, useState, useRef, type ReactNode } fr
export interface Tab {
id: number;
type: 'home' | 'terminal' | 'ssh_manager' | 'server' | 'admin' | 'config';
type: 'home' | 'terminal' | 'ssh_manager' | 'server' | 'admin' | 'file_manager';
title: string;
hostConfig?: any;
terminalRef?: React.RefObject<any>;
@@ -42,7 +42,7 @@ export function TabProvider({ children }: TabProviderProps) {
const nextTabId = useRef(2);
function computeUniqueTitle(tabType: Tab['type'], desiredTitle: string | undefined): string {
const defaultTitle = tabType === 'server' ? 'Server' : (tabType === 'config' ? 'Config' : 'Terminal');
const defaultTitle = tabType === 'server' ? 'Server' : (tabType === 'file_manager' ? 'File Manager' : 'Terminal');
const baseTitle = (desiredTitle || defaultTitle).trim();
// Extract base name without trailing " (n)"
const match = baseTitle.match(/^(.*) \((\d+)\)$/);
@@ -72,7 +72,7 @@ export function TabProvider({ children }: TabProviderProps) {
const addTab = (tabData: Omit<Tab, 'id'>): number => {
const id = nextTabId.current++;
const needsUniqueTitle = tabData.type === 'terminal' || tabData.type === 'server' || tabData.type === 'config';
const needsUniqueTitle = tabData.type === 'terminal' || tabData.type === 'server' || tabData.type === 'file_manager';
const effectiveTitle = needsUniqueTitle ? computeUniqueTitle(tabData.type, tabData.title) : (tabData.title || '');
const newTab: Tab = {
...tabData,

8
src/ui/Navigation/TopNavbar.tsx
View File

@@ -53,11 +53,11 @@ export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): Reac
const isSplit = Array.isArray(allSplitScreenTab) && allSplitScreenTab.includes(tab.id);
const isTerminal = tab.type === 'terminal';
const isServer = tab.type === 'server';
const isConfig = tab.type === 'config';
const isFileManager = tab.type === 'file_manager';
const isSshManager = tab.type === 'ssh_manager';
const isAdmin = tab.type === 'admin';
// Split availability
const isSplittable = isTerminal || isServer || isConfig;
const isSplittable = isTerminal || isServer || isFileManager;
// Disable split entirely when on Home or SSH Manager
const isSplitButtonDisabled = (isActive && !isSplitScreenActive) || ((allSplitScreenTab?.length || 0) >= 3 && !isSplit);
const disableSplit = !isSplittable || isSplitButtonDisabled || isActive || currentTabIsHome || currentTabIsSshManager || currentTabIsAdmin;
@@ -70,10 +70,10 @@ export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): Reac
title={tab.title}
isActive={isActive}
onActivate={() => handleTabActivate(tab.id)}
onClose={isTerminal || isServer || isConfig || isSshManager || isAdmin ? () => handleTabClose(tab.id) : undefined}
onClose={isTerminal || isServer || isFileManager || isSshManager || isAdmin ? () => handleTabClose(tab.id) : undefined}
onSplit={isSplittable ? () => handleTabSplit(tab.id) : undefined}
canSplit={isSplittable}
canClose={isTerminal || isServer || isConfig || isSshManager || isAdmin}
canClose={isTerminal || isServer || isFileManager || isSshManager || isAdmin}
disableActivate={disableActivate}
disableSplit={disableSplit}
disableClose={disableClose}

55
src/ui/apps/File Manager/FileManager.tsx
View File

@@ -7,15 +7,15 @@ import {Button} from '@/components/ui/button.tsx';
import {FIleManagerTopNavbar} from "@/ui/apps/File Manager/FIleManagerTopNavbar.tsx";
import {cn} from '@/lib/utils.ts';
import {
getConfigEditorRecent,
getConfigEditorPinned,
getConfigEditorShortcuts,
addConfigEditorRecent,
removeConfigEditorRecent,
addConfigEditorPinned,
removeConfigEditorPinned,
addConfigEditorShortcut,
removeConfigEditorShortcut,
getFileManagerRecent,
getFileManagerPinned,
getFileManagerShortcuts,
addFileManagerRecent,
removeFileManagerRecent,
addFileManagerPinned,
removeFileManagerPinned,
addFileManagerShortcut,
removeFileManagerShortcut,
readSSHFile,
writeSSHFile,
getSSHStatus,
@@ -52,14 +52,18 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
updatedAt: string;
}
export function FileManager({onSelectView, embedded = false, initialHost = null}: { onSelectView?: (view: string) => void, embedded?: boolean, initialHost?: SSHHost | null }): React.ReactElement {
export function FileManager({onSelectView, embedded = false, initialHost = null}: {
onSelectView?: (view: string) => void,
embedded?: boolean,
initialHost?: SSHHost | null
}): React.ReactElement {
const [tabs, setTabs] = useState<Tab[]>([]);
const [activeTab, setActiveTab] = useState<string | number>('home');
const [recent, setRecent] = useState<any[]>([]);
@@ -118,9 +122,9 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
try {
const homeDataPromise = Promise.all([
getConfigEditorRecent(currentHost.id),
getConfigEditorPinned(currentHost.id),
getConfigEditorShortcuts(currentHost.id),
getFileManagerRecent(currentHost.id),
getFileManagerPinned(currentHost.id),
getFileManagerShortcuts(currentHost.id),
]);
const timeoutPromise = new Promise((_, reject) =>
@@ -197,7 +201,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
loading: false,
error: undefined
} : t));
await addConfigEditorRecent({
await addFileManagerRecent({
name: file.name,
path: file.path,
isSSH: true,
@@ -215,7 +219,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
const handleRemoveRecent = async (file: any) => {
try {
await removeConfigEditorRecent({
await removeFileManagerRecent({
name: file.name,
path: file.path,
isSSH: true,
@@ -229,7 +233,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
const handlePinFile = async (file: any) => {
try {
await addConfigEditorPinned({
await addFileManagerPinned({
name: file.name,
path: file.path,
isSSH: true,
@@ -246,7 +250,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
const handleUnpinFile = async (file: any) => {
try {
await removeConfigEditorPinned({
await removeFileManagerPinned({
name: file.name,
path: file.path,
isSSH: true,
@@ -286,7 +290,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
const handleAddShortcut = async (folderPath: string) => {
try {
const name = folderPath.split('/').pop() || folderPath;
await addConfigEditorShortcut({
await addFileManagerShortcut({
name,
path: folderPath,
isSSH: true,
@@ -300,7 +304,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
const handleRemoveShortcut = async (shortcut: any) => {
try {
await removeConfigEditorShortcut({
await removeFileManagerShortcut({
name: shortcut.name,
path: shortcut.path,
isSSH: true,
@@ -402,7 +406,7 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
Promise.allSettled([
(async () => {
try {
await addConfigEditorRecent({
await addFileManagerRecent({
name: tab.fileName,
path: tab.filePath,
isSSH: true,
@@ -445,14 +449,16 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
};
// Host is locked; no external host change from UI
const handleHostChange = (_host: SSHHost | null) => {};
const handleHostChange = (_host: SSHHost | null) => {
};
if (!currentHost) {
return (
<div style={{position: 'relative', width: '100%', height: '100%', overflow: 'hidden'}}>
<div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100%', zIndex: 20}}>
<FileManagerLeftSidebar
onSelectView={onSelectView || (() => {})}
onSelectView={onSelectView || (() => {
})}
onOpenFile={handleOpenFile}
tabs={tabs}
ref={sidebarRef}
@@ -483,7 +489,8 @@ export function FileManager({onSelectView, embedded = false, initialHost = null}
<div style={{position: 'relative', width: '100%', height: '100%', overflow: 'hidden'}}>
<div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100%', zIndex: 20}}>
<FileManagerLeftSidebar
onSelectView={onSelectView || (() => {})}
onSelectView={onSelectView || (() => {
})}
onOpenFile={handleOpenFile}
tabs={tabs}
ref={sidebarRef}

4
src/ui/apps/File Manager/FileManagerFileEditor.tsx
View File

@@ -5,13 +5,13 @@ import {hyperLink} from '@uiw/codemirror-extensions-hyper-link';
import {oneDark} from '@codemirror/theme-one-dark';
import {EditorView} from '@codemirror/view';
interface ConfigCodeEditorProps {
interface FileManagerCodeEditorProps {
content: string;
fileName: string;
onContentChange: (value: string) => void;
}
export function FileManagerFileEditor({content, fileName, onContentChange}: ConfigCodeEditorProps) {
export function FileManagerFileEditor({content, fileName, onContentChange}: FileManagerCodeEditorProps) {
function getLanguageName(filename: string): string {
if (!filename || typeof filename !== 'string') {
return 'text';

4
src/ui/apps/File Manager/FileManagerHomeView.tsx
View File

@@ -18,7 +18,7 @@ interface ShortcutItem {
path: string;
}
interface ConfigHomeViewProps {
interface FileManagerHomeViewProps {
recent: FileItem[];
pinned: FileItem[];
shortcuts: ShortcutItem[];
@@ -42,7 +42,7 @@ export function FileManagerHomeView({
onOpenShortcut,
onRemoveShortcut,
onAddShortcut
}: ConfigHomeViewProps) {
}: FileManagerHomeViewProps) {
const [tab, setTab] = useState<'recent' | 'pinned' | 'shortcuts'>('recent');
const [newShortcut, setNewShortcut] = useState('');

16
src/ui/apps/File Manager/FileManagerLeftSidebar.tsx
View File

@@ -9,9 +9,9 @@ import {
listSSHFiles,
connectSSH,
getSSHStatus,
getConfigEditorPinned,
addConfigEditorPinned,
removeConfigEditorPinned
getFileManagerPinned,
addFileManagerPinned,
removeFileManagerPinned
} from '@/ui/main-axios.ts';
interface SSHHost {
@@ -30,14 +30,14 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
updatedAt: string;
}
const FileManagerLeftSidebar = forwardRef(function ConfigEditorSidebar(
const FileManagerLeftSidebar = forwardRef(function FileManagerSidebar(
{onSelectView, onOpenFile, tabs, host}: {
onSelectView?: (view: string) => void;
onOpenFile: (file: any) => void;
@@ -146,7 +146,7 @@ const FileManagerLeftSidebar = forwardRef(function ConfigEditorSidebar(
let pinnedFiles: any[] = [];
try {
if (host) {
pinnedFiles = await getConfigEditorPinned(host.id);
pinnedFiles = await getFileManagerPinned(host.id);
}
} catch (err) {
}
@@ -336,7 +336,7 @@ const FileManagerLeftSidebar = forwardRef(function ConfigEditorSidebar(
e.stopPropagation();
try {
if (item.isPinned) {
await removeConfigEditorPinned({
await removeFileManagerPinned({
name: item.name,
path: item.path,
hostId: host?.id,
@@ -347,7 +347,7 @@ const FileManagerLeftSidebar = forwardRef(function ConfigEditorSidebar(
f.path === item.path ? { ...f, isPinned: false } : f
));
} else {
await addConfigEditorPinned({
await addFileManagerPinned({
name: item.name,
path: item.path,
hostId: host?.id,

4
src/ui/apps/File Manager/FileManagerLeftSidebarFileViewer.tsx
View File

@@ -20,7 +20,7 @@ interface FileItem {
isStarred?: boolean;
}
interface ConfigFileSidebarViewerProps {
interface FileManagerLeftSidebarVileViewerProps {
sshConnections: SSHConnection[];
onAddSSH: () => void;
onConnectSSH: (conn: SSHConnection) => void;
@@ -60,7 +60,7 @@ export function FileManagerLeftSidebarFileViewer({
onSwitchToLocal,
onSwitchToSSH,
currentSSH,
}: ConfigFileSidebarViewerProps) {
}: FileManagerLeftSidebarVileViewerProps) {
return (
<div className="flex flex-col h-full">
{/* SSH Connections */}

8
src/ui/apps/File Manager/FileManagerTabList.tsx
View File

@@ -2,20 +2,20 @@ import React from 'react';
import {Button} from '@/components/ui/button.tsx';
import {X, Home} from 'lucide-react';
interface ConfigTab {
interface FileManagerTab {
id: string | number;
title: string;
}
interface ConfigTabListProps {
tabs: ConfigTab[];
interface FileManagerTabList {
tabs: FileManagerTab[];
activeTab: string | number;
setActiveTab: (tab: string | number) => void;
closeTab: (tab: string | number) => void;
onHomeClick: () => void;
}
export function FileManagerTabList({tabs, activeTab, setActiveTab, closeTab, onHomeClick}: ConfigTabListProps) {
export function FileManagerTabList({tabs, activeTab, setActiveTab, closeTab, onHomeClick}: FileManagerTabList) {
return (
<div className="inline-flex items-center h-full px-[0.5rem] overflow-x-auto">
<Button

6
src/ui/apps/Host Manager/HostManager.tsx
View File

@@ -5,7 +5,7 @@ import {Separator} from "@/components/ui/separator.tsx";
import {HostManagerHostEditor} from "@/ui/apps/Host Manager/HostManagerHostEditor.tsx";
import {useSidebar} from "@/components/ui/sidebar.tsx";
interface ConfigEditorProps {
interface HostManagerProps {
onSelectView: (view: string) => void;
isTopbarOpen?: boolean;
}
@@ -26,14 +26,14 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
updatedAt: string;
}
export function HostManager({onSelectView, isTopbarOpen}: ConfigEditorProps): React.ReactElement {
export function HostManager({onSelectView, isTopbarOpen}: HostManagerProps): React.ReactElement {
const [activeTab, setActiveTab] = useState("host_viewer");
const [editingHost, setEditingHost] = useState<SSHHost | null>(null);
const {state: sidebarState} = useSidebar();

14
src/ui/apps/Host Manager/HostManagerHostEditor.tsx
View File

@@ -37,7 +37,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
@@ -120,7 +120,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
retryInterval: z.coerce.number().min(1).max(3600).default(10),
autoStart: z.boolean().default(false),
})).default([]),
enableConfigEditor: z.boolean().default(true),
enableFileManager: z.boolean().default(true),
defaultPath: z.string().optional(),
}).superRefine((data, ctx) => {
if (data.authType === 'password') {
@@ -178,7 +178,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
keyType: "auto",
enableTerminal: editingHost?.enableTerminal !== false,
enableTunnel: editingHost?.enableTunnel !== false,
enableConfigEditor: editingHost?.enableConfigEditor !== false,
enableFileManager: editingHost?.enableFileManager !== false,
defaultPath: editingHost?.defaultPath || "/",
tunnelConnections: editingHost?.tunnelConnections || [],
}
@@ -205,7 +205,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
keyType: (editingHost.keyType as any) || "auto",
enableTerminal: editingHost.enableTerminal !== false,
enableTunnel: editingHost.enableTunnel !== false,
enableConfigEditor: editingHost.enableConfigEditor !== false,
enableFileManager: editingHost.enableFileManager !== false,
defaultPath: editingHost.defaultPath || "/",
tunnelConnections: editingHost.tunnelConnections || [],
});
@@ -227,7 +227,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
keyType: "auto",
enableTerminal: true,
enableTunnel: true,
enableConfigEditor: true,
enableFileManager: true,
defaultPath: "/",
tunnelConnections: [],
});
@@ -989,7 +989,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
<TabsContent value="file_manager">
<FormField
control={form.control}
name="enableConfigEditor"
name="enableFileManager"
render={({field}) => (
<FormItem>
<FormLabel>Enable File Manager</FormLabel>
@@ -1006,7 +1006,7 @@ export function HostManagerHostEditor({editingHost, onFormSubmit}: SSHManagerHos
)}
/>
{form.watch('enableConfigEditor') && (
{form.watch('enableFileManager') && (
<div className="mt-4">
<FormField
control={form.control}

20
src/ui/apps/Host Manager/HostManagerHostViewer.tsx
View File

@@ -35,7 +35,7 @@ interface SSHHost {
authType: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
@@ -275,7 +275,7 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
pin: true,
enableTerminal: true,
enableTunnel: false,
enableConfigEditor: true,
enableFileManager: true,
defaultPath: "/var/www"
},
{
@@ -292,7 +292,7 @@ export function HostManagerHostViewer({onEditHost}: SSHManagerHostViewerProps) {
pin: false,
enableTerminal: true,
enableTunnel: true,
enableConfigEditor: false,
enableFileManager: false,
tunnelConnections: [
{
sourcePort: 5432,
@@ -347,7 +347,7 @@ OPTIONAL FIELDS:
• pin: Pin to top (boolean)
• enableTerminal: Show in Terminal tab (boolean, default: true)
• enableTunnel: Show in Tunnel tab (boolean, default: true)
• enableConfigEditor: Show in Config Editor tab (boolean, default: true)
• enableFileManager: Show in File Manager tab (boolean, default: true)
• defaultPath: Default directory path (string)
TUNNEL CONFIGURATION:
@@ -374,7 +374,7 @@ EXAMPLE STRUCTURE:
"pin": true,
"enableTerminal": true,
"enableTunnel": false,
"enableConfigEditor": true,
"enableFileManager": true,
"defaultPath": "/var/www"
}
]
@@ -500,8 +500,8 @@ EXAMPLE STRUCTURE:
<button class="copy-btn" onclick="navigator.clipboard.writeText('enableTunnel')">Copy</button>
</div>
<div class="field-item">
<code>enableConfigEditor</code> - Show in Config Editor tab (boolean, default: true)
<button class="copy-btn" onclick="navigator.clipboard.writeText('enableConfigEditor')">Copy</button>
<code>enableFileManager</code> - Show in File Manager tab (boolean, default: true)
<button class="copy-btn" onclick="navigator.clipboard.writeText('enableFileManager')">Copy</button>
</div>
<div class="field-item">
<code>defaultPath</code> - Default directory path (string)
@@ -558,7 +558,7 @@ EXAMPLE STRUCTURE:
"pin": true,
"enableTerminal": true,
"enableTunnel": false,
"enableConfigEditor": true,
"enableFileManager": true,
"defaultPath": "/var/www"
}
]
@@ -709,10 +709,10 @@ EXAMPLE STRUCTURE:
)}
</Badge>
)}
{host.enableConfigEditor && (
{host.enableFileManager && (
<Badge variant="outline" className="text-xs px-1 py-0">
<FileEdit className="h-2 w-2 mr-0.5"/>
Config
File Manager
</Badge>
)}
</div>

6
src/ui/apps/Server/Server.tsx
View File

@@ -145,7 +145,7 @@ export function Server({ hostConfig, title, isVisible = true, isTopbarOpen = tru
</Status>
</div>
<div className="flex items-center">
{currentHostConfig?.enableConfigEditor && (
{currentHostConfig?.enableFileManager && (
<Button
variant="outline"
className="font-semibold"
@@ -155,7 +155,7 @@ export function Server({ hostConfig, title, isVisible = true, isTopbarOpen = tru
? currentHostConfig.name.trim()
: `${currentHostConfig.username}@${currentHostConfig.ip}`;
addTab({
type: 'config',
type: 'file_manager',
title: titleBase,
hostConfig: currentHostConfig,
});
@@ -194,7 +194,7 @@ export function Server({ hostConfig, title, isVisible = true, isTopbarOpen = tru
{/* Memory */}
<div className="flex-1 min-w-0 px-2 py-2">
<h1 className="font-bold text-lg flex flex-row gap-2 mb-1">
<h1 className="font-bold xt-lg flex flex-row gap-2 mb-1">
<MemoryStick/>
{(() => {
const pct = metrics?.memory?.percent;

2
src/ui/apps/Tunnel/Tunnel.tsx
View File

@@ -27,7 +27,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: TunnelConnection[];
createdAt: string;

2
src/ui/apps/Tunnel/TunnelObject.tsx
View File

@@ -53,7 +53,7 @@ interface SSHHost {
authType: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: TunnelConnection[];
createdAt: string;

2
src/ui/apps/Tunnel/TunnelViewer.tsx
View File

@@ -22,7 +22,7 @@ interface SSHHost {
authType: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: TunnelConnection[];
createdAt: string;

52
src/ui/main-axios.ts
View File

@@ -15,7 +15,7 @@ interface SSHHostData {
keyType?: string;
enableTerminal?: boolean;
enableTunnel?: boolean;
enableConfigEditor?: boolean;
enableFileManager?: boolean;
defaultPath?: string;
tunnelConnections?: any[];
}
@@ -36,7 +36,7 @@ interface SSHHost {
keyType?: string;
enableTerminal: boolean;
enableTunnel: boolean;
enableConfigEditor: boolean;
enableFileManager: boolean;
defaultPath: string;
tunnelConnections: any[];
createdAt: string;
@@ -80,7 +80,7 @@ interface TunnelStatus {
retryExhausted?: boolean;
}
interface ConfigEditorFile {
interface FileManagerFile {
name: string;
path: string;
type?: 'file' | 'directory';
@@ -88,7 +88,7 @@ interface ConfigEditorFile {
sshSessionId?: string;
}
interface ConfigEditorShortcut {
interface FileManagerShortcut {
name: string;
path: string;
}
@@ -121,7 +121,7 @@ const tunnelApi = axios.create({
},
});
const configEditorApi = axios.create({
const fileManagerApi = axios.create({
baseURL: isLocalhost ? 'http://localhost:8084' : '',
headers: {
'Content-Type': 'application/json',
@@ -165,7 +165,7 @@ tunnelApi.interceptors.request.use((config) => {
return config;
});
configEditorApi.interceptors.request.use((config) => {
fileManagerApi.interceptors.request.use((config) => {
const token = getCookie('jwt');
if (token) {
config.headers.Authorization = `Bearer ${token}`;
@@ -199,7 +199,7 @@ export async function createSSHHost(hostData: SSHHostData): Promise<SSHHost> {
keyType: hostData.authType === 'key' ? hostData.keyType : '',
enableTerminal: hostData.enableTerminal !== false,
enableTunnel: hostData.enableTunnel !== false,
enableConfigEditor: hostData.enableConfigEditor !== false,
enableFileManager: hostData.enableFileManager !== false,
defaultPath: hostData.defaultPath || '/',
tunnelConnections: hostData.tunnelConnections || [],
};
@@ -208,7 +208,7 @@ export async function createSSHHost(hostData: SSHHostData): Promise<SSHHost> {
submitData.tunnelConnections = [];
}
if (!submitData.enableConfigEditor) {
if (!submitData.enableFileManager) {
submitData.defaultPath = '';
}
@@ -253,7 +253,7 @@ export async function updateSSHHost(hostId: number, hostData: SSHHostData): Prom
keyType: hostData.authType === 'key' ? hostData.keyType : '',
enableTerminal: hostData.enableTerminal !== false,
enableTunnel: hostData.enableTunnel !== false,
enableConfigEditor: hostData.enableConfigEditor !== false,
enableFileManager: hostData.enableFileManager !== false,
defaultPath: hostData.defaultPath || '/',
tunnelConnections: hostData.tunnelConnections || [],
};
@@ -261,7 +261,7 @@ export async function updateSSHHost(hostId: number, hostData: SSHHostData): Prom
if (!submitData.enableTunnel) {
submitData.tunnelConnections = [];
}
if (!submitData.enableConfigEditor) {
if (!submitData.enableFileManager) {
submitData.defaultPath = '';
}
@@ -362,7 +362,7 @@ export async function cancelTunnel(tunnelName: string): Promise<any> {
}
}
export async function getConfigEditorRecent(hostId: number): Promise<ConfigEditorFile[]> {
export async function getFileManagerRecent(hostId: number): Promise<FileManagerFile[]> {
try {
const response = await sshHostApi.get(`/ssh/file_manager/recent?hostId=${hostId}`);
return response.data || [];
@@ -371,7 +371,7 @@ export async function getConfigEditorRecent(hostId: number): Promise<ConfigEdito
}
}
export async function addConfigEditorRecent(file: {
export async function addFileManagerRecent(file: {
name: string;
path: string;
isSSH: boolean;
@@ -386,7 +386,7 @@ export async function addConfigEditorRecent(file: {
}
}
export async function removeConfigEditorRecent(file: {
export async function removeFileManagerRecent(file: {
name: string;
path: string;
isSSH: boolean;
@@ -401,7 +401,7 @@ export async function removeConfigEditorRecent(file: {
}
}
export async function getConfigEditorPinned(hostId: number): Promise<ConfigEditorFile[]> {
export async function getFileManagerPinned(hostId: number): Promise<FileManagerFile[]> {
try {
const response = await sshHostApi.get(`/ssh/file_manager/pinned?hostId=${hostId}`);
return response.data || [];
@@ -410,7 +410,7 @@ export async function getConfigEditorPinned(hostId: number): Promise<ConfigEdito
}
}
export async function addConfigEditorPinned(file: {
export async function addFileManagerPinned(file: {
name: string;
path: string;
isSSH: boolean;
@@ -425,7 +425,7 @@ export async function addConfigEditorPinned(file: {
}
}
export async function removeConfigEditorPinned(file: {
export async function removeFileManagerPinned(file: {
name: string;
path: string;
isSSH: boolean;
@@ -440,7 +440,7 @@ export async function removeConfigEditorPinned(file: {
}
}
export async function getConfigEditorShortcuts(hostId: number): Promise<ConfigEditorShortcut[]> {
export async function getFileManagerShortcuts(hostId: number): Promise<FileManagerShortcut[]> {
try {
const response = await sshHostApi.get(`/ssh/file_manager/shortcuts?hostId=${hostId}`);
return response.data || [];
@@ -449,7 +449,7 @@ export async function getConfigEditorShortcuts(hostId: number): Promise<ConfigEd
}
}
export async function addConfigEditorShortcut(shortcut: {
export async function addFileManagerShortcut(shortcut: {
name: string;
path: string;
isSSH: boolean;
@@ -464,7 +464,7 @@ export async function addConfigEditorShortcut(shortcut: {
}
}
export async function removeConfigEditorShortcut(shortcut: {
export async function removeFileManagerShortcut(shortcut: {
name: string;
path: string;
isSSH: boolean;
@@ -488,7 +488,7 @@ export async function connectSSH(sessionId: string, config: {
keyPassword?: string;
}): Promise<any> {
try {
const response = await configEditorApi.post('/ssh/file_manager/ssh/connect', {
const response = await fileManagerApi.post('/ssh/file_manager/ssh/connect', {
sessionId,
...config
});
@@ -500,7 +500,7 @@ export async function connectSSH(sessionId: string, config: {
export async function disconnectSSH(sessionId: string): Promise<any> {
try {
const response = await configEditorApi.post('/ssh/file_manager/ssh/disconnect', {sessionId});
const response = await fileManagerApi.post('/ssh/file_manager/ssh/disconnect', {sessionId});
return response.data;
} catch (error) {
throw error;
@@ -509,7 +509,7 @@ export async function disconnectSSH(sessionId: string): Promise<any> {
export async function getSSHStatus(sessionId: string): Promise<{ connected: boolean }> {
try {
const response = await configEditorApi.get('/ssh/file_manager/ssh/status', {
const response = await fileManagerApi.get('/ssh/file_manager/ssh/status', {
params: {sessionId}
});
return response.data;
@@ -520,7 +520,7 @@ export async function getSSHStatus(sessionId: string): Promise<{ connected: bool
export async function listSSHFiles(sessionId: string, path: string): Promise<any[]> {
try {
const response = await configEditorApi.get('/ssh/file_manager/ssh/listFiles', {
const response = await fileManagerApi.get('/ssh/file_manager/ssh/listFiles', {
params: {sessionId, path}
});
return response.data || [];
@@ -531,7 +531,7 @@ export async function listSSHFiles(sessionId: string, path: string): Promise<any
export async function readSSHFile(sessionId: string, path: string): Promise<{ content: string; path: string }> {
try {
const response = await configEditorApi.get('/ssh/file_manager/ssh/readFile', {
const response = await fileManagerApi.get('/ssh/file_manager/ssh/readFile', {
params: {sessionId, path}
});
return response.data;
@@ -542,7 +542,7 @@ export async function readSSHFile(sessionId: string, path: string): Promise<{ co
export async function writeSSHFile(sessionId: string, path: string, content: string): Promise<any> {
try {
const response = await configEditorApi.post('/ssh/file_manager/ssh/writeFile', {
const response = await fileManagerApi.post('/ssh/file_manager/ssh/writeFile', {
sessionId,
path,
content
@@ -558,7 +558,7 @@ export async function writeSSHFile(sessionId: string, path: string, content: str
}
}
export {sshHostApi, tunnelApi, configEditorApi};
export {sshHostApi, tunnelApi, fileManagerApi};
export async function getAllServerStatuses(): Promise<Record<number, ServerStatus>> {
try {