Skip to content

Self-hosted, plugin-based server management.

Added config editor to tab system, (W.I.P)

LukeGus22162e5b9bf1
diff --git a/src/App.tsx b/src/App.tsx
index 649d49658..3814169cf 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -88,7 +88,7 @@ function AppContent() {
// Determine what to show based on current tab
const currentTabData = tabs.find(tab => tab.id === currentTab);
- const showTerminalView = currentTabData?.type === 'terminal' || currentTabData?.type === 'server';
+ const showTerminalView = currentTabData?.type === 'terminal' || currentTabData?.type === 'server' || currentTabData?.type === 'config';
const showHome = currentTabData?.type === 'home';
const showSshManager = currentTabData?.type === 'ssh_manager';
const showAdmin = currentTabData?.type === 'admin';
diff --git a/src/contexts/TabContext.tsx b/src/contexts/TabContext.tsx
index 7cf13dcde..24bd0b225 100644
--- a/src/contexts/TabContext.tsx
+++ b/src/contexts/TabContext.tsx
@@ -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';
+ type: 'home' | 'terminal' | 'ssh_manager' | 'server' | 'admin' | 'config';
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' : 'Terminal';
+ const defaultTitle = tabType === 'server' ? 'Server' : (tabType === 'config' ? 'Config' : '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';
+ const needsUniqueTitle = tabData.type === 'terminal' || tabData.type === 'server' || tabData.type === 'config';
const effectiveTitle = needsUniqueTitle ? computeUniqueTitle(tabData.type, tabData.title) : (tabData.title || '');
const newTab: Tab = {
...tabData,
diff --git a/src/ui/Navigation/AppView.tsx b/src/ui/Navigation/AppView.tsx
index 8c03e2308..61263867e 100644
--- a/src/ui/Navigation/AppView.tsx
+++ b/src/ui/Navigation/AppView.tsx
@@ -1,6 +1,7 @@
import React, { useEffect, useRef, useState } from "react";
import {TerminalComponent} from "../SSH/Terminal/TerminalComponent.tsx";
import {Server as ServerView} from "@/ui/SSH/Server/Server.tsx";
+import {ConfigEditor} from "@/ui/SSH/Config Editor/ConfigEditor.tsx";
import {useTabs} from "@/contexts/TabContext.tsx";
import {ResizablePanelGroup, ResizablePanel, ResizableHandle} from '@/components/ui/resizable.tsx';
import * as ResizablePrimitive from "react-resizable-panels";
@@ -16,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');
+ const terminalTabs = tabs.filter((tab: any) => tab.type === 'terminal' || tab.type === 'server' || tab.type === 'config');
const containerRef = useRef<HTMLDivElement | null>(null);
const panelRefs = useRef<Record<string, HTMLDivElement | null>>({});
@@ -158,7 +159,7 @@ export function AppView({ isTopbarOpen = true }: TerminalViewProps): React.React
showTitle={false}
splitScreen={allSplitScreenTab.length>0}
/>
- ) : (
+ ) : t.type === 'server' ? (
<ServerView
hostConfig={t.hostConfig}
title={t.title}
@@ -166,6 +167,11 @@ export function AppView({ isTopbarOpen = true }: TerminalViewProps): React.React
isTopbarOpen={isTopbarOpen}
embedded
/>
+ ) : (
+ <ConfigEditor
+ embedded
+ initialHost={t.hostConfig}
+ />
)}
</div>
</div>
diff --git a/src/ui/Navigation/Tabs/Tab.tsx b/src/ui/Navigation/Tabs/Tab.tsx
index 558136f55..f9b793f0a 100644
--- a/src/ui/Navigation/Tabs/Tab.tsx
+++ b/src/ui/Navigation/Tabs/Tab.tsx
@@ -1,7 +1,7 @@
import React from "react";
import {ButtonGroup} from "@/components/ui/button-group.tsx";
import {Button} from "@/components/ui/button.tsx";
-import {Home, SeparatorVertical, X, Terminal as TerminalIcon, Server as ServerIcon} from "lucide-react";
+import {Home, SeparatorVertical, X, Terminal as TerminalIcon, Server as ServerIcon, Folder as FolderIcon} from "lucide-react";
interface TabProps {
tabType: string;
@@ -31,8 +31,9 @@ export function Tab({tabType, title, isActive, onActivate, onClose, onSplit, can
);
}
- if (tabType === "terminal" || tabType === "server") {
+ if (tabType === "terminal" || tabType === "server" || tabType === "config") {
const isServer = tabType === 'server';
+ const isConfig = tabType === 'config';
return (
<ButtonGroup>
<Button
@@ -41,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"/> : <TerminalIcon className="mr-1 h-4 w-4"/>}
- {title || (isServer ? 'Server' : 'Terminal')}
+ {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')}
</Button>
{canSplit && (
<Button
diff --git a/src/ui/Navigation/TopNavbar.tsx b/src/ui/Navigation/TopNavbar.tsx
index ef39e5c3c..da962cfdf 100644
--- a/src/ui/Navigation/TopNavbar.tsx
+++ b/src/ui/Navigation/TopNavbar.tsx
@@ -53,10 +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 isSshManager = tab.type === 'ssh_manager';
const isAdmin = tab.type === 'admin';
// Split availability
- const isSplittable = isTerminal || isServer;
+ const isSplittable = isTerminal || isServer || isConfig;
// 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;
@@ -69,10 +70,10 @@ export function TopNavbar({isTopbarOpen, setIsTopbarOpen}: TopNavbarProps): Reac
title={tab.title}
isActive={isActive}
onActivate={() => handleTabActivate(tab.id)}
- onClose={isTerminal || isServer || isSshManager || isAdmin ? () => handleTabClose(tab.id) : undefined}
+ onClose={isTerminal || isServer || isConfig || isSshManager || isAdmin ? () => handleTabClose(tab.id) : undefined}
onSplit={isSplittable ? () => handleTabSplit(tab.id) : undefined}
canSplit={isSplittable}
- canClose={isTerminal || isServer || isSshManager || isAdmin}
+ canClose={isTerminal || isServer || isConfig || isSshManager || isAdmin}
disableActivate={disableActivate}
disableSplit={disableSplit}
disableClose={disableClose}
diff --git a/src/ui/SSH/Config Editor/ConfigEditor.tsx b/src/ui/SSH/Config Editor/ConfigEditor.tsx
index 6ac5eb6f8..69029a3bd 100644
--- a/src/ui/SSH/Config Editor/ConfigEditor.tsx
+++ b/src/ui/SSH/Config Editor/ConfigEditor.tsx
@@ -59,7 +59,7 @@ interface SSHHost {
updatedAt: string;
}
-export function ConfigEditor({onSelectView}: { onSelectView: (view: string) => void }): React.ReactElement {
+export function ConfigEditor({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[]>([]);
@@ -71,6 +71,22 @@ export function ConfigEditor({onSelectView}: { onSelectView: (view: string) => v
const sidebarRef = useRef<any>(null);
+ useEffect(() => {
+ if (initialHost && (!currentHost || currentHost.id !== initialHost.id)) {
+ setCurrentHost(initialHost);
+ // Defer to ensure sidebar is mounted
+ setTimeout(() => {
+ try {
+ const path = initialHost.defaultPath || '/';
+ if (sidebarRef.current && sidebarRef.current.openFolder) {
+ sidebarRef.current.openFolder(initialHost, path);
+ }
+ } catch (e) {
+ }
+ }, 0);
+ }
+ }, [initialHost]);
+
useEffect(() => {
if (currentHost) {
fetchHomeData();
@@ -428,22 +444,19 @@ export function ConfigEditor({onSelectView}: { onSelectView: (view: string) => v
}
};
- const handleHostChange = (host: SSHHost | null) => {
- setCurrentHost(host);
- setTabs([]);
- setActiveTab('home');
- };
+ // Host is locked; no external host change from UI
+ const handleHostChange = (_host: SSHHost | null) => {};
if (!currentHost) {
return (
- <div style={{position: 'relative', width: '100vw', height: '100vh', overflow: 'hidden'}}>
- <div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100vh', zIndex: 20}}>
+ <div style={{position: 'relative', width: '100%', height: '100%', overflow: 'hidden'}}>
+ <div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100%', zIndex: 20}}>
<ConfigEditorSidebar
- onSelectView={onSelectView}
+ onSelectView={onSelectView || (() => {})}
onOpenFile={handleOpenFile}
tabs={tabs}
ref={sidebarRef}
- onHostChange={handleHostChange}
+ host={initialHost as SSHHost}
/>
</div>
<div style={{
@@ -467,23 +480,23 @@ export function ConfigEditor({onSelectView}: { onSelectView: (view: string) => v
}
return (
- <div style={{position: 'relative', width: '100vw', height: '100vh', overflow: 'hidden'}}>
- <div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100vh', zIndex: 20}}>
+ <div style={{position: 'relative', width: '100%', height: '100%', overflow: 'hidden'}}>
+ <div style={{position: 'absolute', top: 0, left: 0, width: 256, height: '100%', zIndex: 20}}>
<ConfigEditorSidebar
- onSelectView={onSelectView}
+ onSelectView={onSelectView || (() => {})}
onOpenFile={handleOpenFile}
tabs={tabs}
ref={sidebarRef}
- onHostChange={handleHostChange}
+ host={currentHost as SSHHost}
/>
</div>
<div style={{position: 'absolute', top: 0, left: 256, right: 0, height: 44, zIndex: 30}}>
- <div className="flex items-center w-full bg-[#18181b] border-b border-[#222224] h-11 relative px-4"
+ <div className="flex items-center w-full bg-[#18181b] border-b-2 border-[#303032] h-11 relative px-4"
style={{height: 44}}>
{/* Tab list scrollable area */}
<div className="flex-1 min-w-0 h-full flex items-center">
<div
- className="h-9 w-full bg-[#09090b] border border-[#23232a] rounded-md flex items-center overflow-x-auto scrollbar-thin scrollbar-thumb-muted-foreground/30 scrollbar-track-transparent"
+ className="h-9 w-full bg-[#09090b] border-2 border-[#303032] rounded-md flex items-center overflow-x-auto scrollbar-thin scrollbar-thumb-muted-foreground/30 scrollbar-track-transparent"
style={{minWidth: 0}}>
<ConfigTopbar
tabs={tabs.map(t => ({id: t.id, title: t.title}))}
diff --git a/src/ui/SSH/Config Editor/ConfigEditorSidebar.tsx b/src/ui/SSH/Config Editor/ConfigEditorSidebar.tsx
index 22579660c..eb9358756 100644
--- a/src/ui/SSH/Config Editor/ConfigEditorSidebar.tsx
+++ b/src/ui/SSH/Config Editor/ConfigEditorSidebar.tsx
@@ -1,21 +1,11 @@
import React, {useEffect, useState, useRef, forwardRef, useImperativeHandle} from 'react';
-import {
- Sidebar,
- SidebarContent,
- SidebarGroup,
- SidebarGroupContent,
- SidebarGroupLabel, SidebarMenu, SidebarMenuItem,
- SidebarProvider
-} from '@/components/ui/sidebar.tsx';
import {Separator} from '@/components/ui/separator.tsx';
import {CornerDownLeft, Folder, File, Server, ArrowUp, Pin} from 'lucide-react';
import {ScrollArea} from '@/components/ui/scroll-area.tsx';
import {cn} from '@/lib/utils.ts';
import {Input} from '@/components/ui/input.tsx';
import {Button} from '@/components/ui/button.tsx';
-import {Accordion, AccordionContent, AccordionItem, AccordionTrigger} from '@/components/ui/accordion.tsx';
import {
- getSSHHosts,
listSSHFiles,
connectSSH,
getSSHStatus,
@@ -48,19 +38,14 @@ interface SSHHost {
}
const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
- {onSelectView, onOpenFile, tabs, onHostChange}: {
- onSelectView: (view: string) => void;
+ {onSelectView, onOpenFile, tabs, host}: {
+ onSelectView?: (view: string) => void;
onOpenFile: (file: any) => void;
tabs: any[];
- onHostChange?: (host: SSHHost | null) => void;
+ host: SSHHost;
},
ref
) {
- const [sshConnections, setSSHConnections] = useState<SSHHost[]>([]);
- const [loadingSSH, setLoadingSSH] = useState(false);
- const [errorSSH, setErrorSSH] = useState<string | undefined>(undefined);
- const [view, setView] = useState<'servers' | 'files'>('servers');
- const [activeServer, setActiveServer] = useState<SSHHost | null>(null);
const [currentPath, setCurrentPath] = useState('/');
const [files, setFiles] = useState<any[]>([]);
const pathInputRef = useRef<HTMLInputElement>(null);
@@ -89,27 +74,14 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
const [fetchingFiles, setFetchingFiles] = useState(false);
useEffect(() => {
- fetchSSH();
- }, []);
-
- async function fetchSSH() {
- setLoadingSSH(true);
- setErrorSSH(undefined);
- try {
- const hosts = await getSSHHosts();
- const configEditorHosts = hosts.filter(host => host.enableConfigEditor);
-
- if (configEditorHosts.length > 0) {
- const firstHost = configEditorHosts[0];
- }
-
- setSSHConnections(configEditorHosts);
- } catch (err: any) {
- setErrorSSH('Failed to load SSH connections');
- } finally {
- setLoadingSSH(false);
- }
- }
+ // when host changes, set path and connect
+ const nextPath = host?.defaultPath || '/';
+ setCurrentPath(nextPath);
+ (async () => {
+ await connectToSSH(host);
+ })();
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [host?.id]);
async function connectToSSH(server: SSHHost): Promise<string | null> {
const sessionId = server.id.toString();
@@ -173,19 +145,19 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
try {
let pinnedFiles: any[] = [];
try {
- if (activeServer) {
- pinnedFiles = await getConfigEditorPinned(activeServer.id);
+ if (host) {
+ pinnedFiles = await getConfigEditorPinned(host.id);
}
} catch (err) {
}
- if (activeServer && sshSessionId) {
+ if (host && sshSessionId) {
let res: any[] = [];
try {
const status = await getSSHStatus(sshSessionId);
if (!status.connected) {
- const newSessionId = await connectToSSH(activeServer);
+ const newSessionId = await connectToSSH(host);
if (newSessionId) {
setSshSessionId(newSessionId);
res = await listSSHFiles(newSessionId, currentPath);
@@ -196,7 +168,7 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
res = await listSSHFiles(sshSessionId, currentPath);
}
} catch (sessionErr) {
- const newSessionId = await connectToSSH(activeServer);
+ const newSessionId = await connectToSSH(host);
if (newSessionId) {
setSshSessionId(newSessionId);
res = await listSSHFiles(newSessionId, currentPath);
@@ -229,48 +201,21 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
}
useEffect(() => {
- if (view === 'files' && activeServer && sshSessionId && !connectingSSH && !fetchingFiles) {
+ if (host && sshSessionId && !connectingSSH && !fetchingFiles) {
const timeoutId = setTimeout(() => {
fetchFiles();
}, 100);
return () => clearTimeout(timeoutId);
}
- }, [currentPath, view, activeServer, sshSessionId]);
-
- async function handleSelectServer(server: SSHHost) {
- if (connectingSSH) {
- return;
- }
-
- setFetchingFiles(false);
- setFilesLoading(false);
- setFilesError(null);
- setFiles([]);
-
- setActiveServer(server);
- setCurrentPath(server.defaultPath || '/');
- setView('files');
-
- const sessionId = await connectToSSH(server);
- if (sessionId) {
- setSshSessionId(sessionId);
- if (onHostChange) {
- onHostChange(server);
- }
- } else {
- w
- setView('servers');
- setActiveServer(null);
- }
- }
+ }, [currentPath, host, sshSessionId]);
useImperativeHandle(ref, () => ({
- openFolder: async (server: SSHHost, path: string) => {
+ openFolder: async (_server: SSHHost, path: string) => {
if (connectingSSH || fetchingFiles) {
return;
}
- if (activeServer?.id === server.id && currentPath === path) {
+ if (currentPath === path) {
setTimeout(() => fetchFiles(), 100);
return;
}
@@ -280,29 +225,14 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
setFilesError(null);
setFiles([]);
- setActiveServer(server);
setCurrentPath(path);
- setView('files');
-
- if (!sshSessionId || activeServer?.id !== server.id) {
- const sessionId = await connectToSSH(server);
- if (sessionId) {
- setSshSessionId(sessionId);
- if (onHostChange && activeServer?.id !== server.id) {
- onHostChange(server);
- }
- } else {
- setView('servers');
- setActiveServer(null);
- }
- } else {
- if (onHostChange && activeServer?.id !== server.id) {
- onHostChange(server);
- }
+ if (!sshSessionId) {
+ const sessionId = await connectToSSH(host);
+ if (sessionId) setSshSessionId(sessionId);
}
},
fetchFiles: () => {
- if (activeServer && sshSessionId) {
+ if (host && sshSessionId) {
fetchFiles();
}
}
@@ -314,30 +244,6 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
}
}, [currentPath]);
- const sshByFolder: Record<string, SSHHost[]> = {};
- sshConnections.forEach(conn => {
- const folder = conn.folder && conn.folder.trim() ? conn.folder : 'No Folder';
- if (!sshByFolder[folder]) sshByFolder[folder] = [];
- sshByFolder[folder].push(conn);
- });
-
- const sortedFolders = Object.keys(sshByFolder);
- if (sortedFolders.includes('No Folder')) {
- sortedFolders.splice(sortedFolders.indexOf('No Folder'), 1);
- sortedFolders.unshift('No Folder');
- }
-
- const filteredSshByFolder: Record<string, SSHHost[]> = {};
- Object.entries(sshByFolder).forEach(([folder, hosts]) => {
- filteredSshByFolder[folder] = hosts.filter(conn => {
- const q = debouncedSearch.trim().toLowerCase();
- if (!q) return true;
- return (conn.name || '').toLowerCase().includes(q) || (conn.ip || '').toLowerCase().includes(q) ||
- (conn.username || '').toLowerCase().includes(q) || (conn.folder || '').toLowerCase().includes(q) ||
- (conn.tags || []).join(' ').toLowerCase().includes(q);
- });
- });
-
const filteredFiles = files.filter(file => {
const q = debouncedFileSearch.trim().toLowerCase();
if (!q) return true;
@@ -345,250 +251,141 @@ const ConfigEditorSidebar = forwardRef(function ConfigEditorSidebar(
});
return (
- <SidebarProvider>
- <Sidebar style={{height: '100vh', maxHeight: '100vh', overflow: 'hidden'}}>
- <SidebarContent style={{height: '100vh', maxHeight: '100vh', overflow: 'hidden'}}>
- <SidebarGroup className="flex flex-col flex-grow h-full overflow-hidden">
- <SidebarGroupLabel className="text-lg font-bold text-white flex items-center gap-2">
- Termix / Config
- </SidebarGroupLabel>
- <Separator className="p-0.25 mt-1 mb-1"/>
- <SidebarGroupContent className="flex flex-col flex-grow min-h-0">
- <SidebarMenu>
- <SidebarMenuItem key={"Homepage"}>
- <Button className="w-full mt-2 mb-2 h-8" onClick={() => onSelectView("homepage")}
- variant="outline">
- <CornerDownLeft/>
- Return
- </Button>
- <Separator className="p-0.25 mt-1 mb-1"/>
- </SidebarMenuItem>
- </SidebarMenu>
- <div
- className="flex-1 w-full flex flex-col rounded-md bg-[#09090b] border border-[#434345] overflow-hidden p-0 relative min-h-0 mt-1">
- {view === 'servers' && (
- <>
- <div
- className="w-full px-2 pt-2 pb-2 bg-[#09090b] z-10 border-b border-[#23232a]">
- <Input
- value={search}
- onChange={e => setSearch(e.target.value)}
- placeholder="Search hosts by name, username, IP, folder, tags..."
- className="w-full h-8 text-sm bg-[#18181b] border border-[#23232a] text-white placeholder:text-muted-foreground rounded"
- autoComplete="off"
- />
- </div>
- <ScrollArea className="flex-1 w-full h-full"
- style={{height: '100%', maxHeight: '100%'}}>
- <div className="flex flex-col h-full">
- <div
- className="w-full flex-grow overflow-hidden p-0 m-0 relative flex flex-col min-h-0">
- <div style={{display: 'flex', justifyContent: 'center'}}>
- <Separator className="w-full h-px bg-[#434345] my-2"
- style={{maxWidth: 213, margin: '0 auto'}}/>
- </div>
- <div className="mx-auto" style={{maxWidth: '213px', width: '100%'}}>
- <div className="flex-1 min-h-0">
- <Accordion type="multiple" className="w-full"
- value={sortedFolders}>
- {sortedFolders.map((folder, idx) => (
- <React.Fragment key={folder}>
- <AccordionItem value={folder}
- className="mt-0 w-full !border-b-transparent">
- <AccordionTrigger
- className="text-base font-semibold rounded-t-none py-2 w-full">{folder}</AccordionTrigger>
- <AccordionContent
- className="flex flex-col gap-1 pb-2 pt-1 w-full">
- {filteredSshByFolder[folder].map(conn => (
- <Button
- key={conn.id}
- variant="outline"
- className="w-full h-10 px-2 bg-[#18181b] border border-[#434345] hover:bg-[#2d2d30] transition-colors text-left justify-start"
- onClick={() => handleSelectServer(conn)}
- >
- <div
- className="flex items-center w-full">
- {conn.pin && <Pin
- className="w-0.5 h-0.5 text-yellow-400 mr-1 flex-shrink-0"/>}
- <span
- className="font-medium truncate">{conn.name || conn.ip}</span>
- </div>
- </Button>
- ))}
- </AccordionContent>
- </AccordionItem>
- {idx < sortedFolders.length - 1 && (
- <div style={{
- display: 'flex',
- justifyContent: 'center'
- }}>
- <Separator
- className="h-px bg-[#434345] my-1"
- style={{width: 213}}/>
- </div>
- )}
- </React.Fragment>
- ))}
- </Accordion>
- </div>
- </div>
- </div>
- </div>
- </ScrollArea>
- </>
- )}
- {view === 'files' && activeServer && (
- <div className="flex flex-col h-full w-full" style={{maxWidth: 260}}>
- <div
- className="flex items-center gap-2 px-2 py-2 border-b border-[#23232a] bg-[#18181b] z-20"
- style={{maxWidth: 260}}>
- <Button
- size="icon"
- variant="outline"
- className="h-8 w-8 bg-[#18181b] border border-[#23232a] rounded-md hover:bg-[#2d2d30] focus:outline-none focus:ring-2 focus:ring-ring"
- onClick={() => {
- let path = currentPath;
- if (path && path !== '/' && path !== '') {
- if (path.endsWith('/')) path = path.slice(0, -1);
- const lastSlash = path.lastIndexOf('/');
- if (lastSlash > 0) {
- setCurrentPath(path.slice(0, lastSlash));
- } else {
- setCurrentPath('/');
- }
- } else {
- setView('servers');
- if (onHostChange) {
- onHostChange(null);
- }
- }
- }}
- >
- <ArrowUp className="w-4 h-4"/>
- </Button>
- <Input ref={pathInputRef} value={currentPath}
- onChange={e => setCurrentPath(e.target.value)}
- className="flex-1 bg-[#18181b] border border-[#434345] text-white truncate rounded-md px-2 py-1 focus:outline-none focus:ring-2 focus:ring-ring hover:border-[#5a5a5d]"
- />
- </div>
- <div className="px-2 py-2 border-b border-[#23232a] bg-[#18181b]">
- <Input
- placeholder="Search files and folders..."
- className="w-full h-7 text-sm bg-[#23232a] border border-[#434345] text-white placeholder:text-muted-foreground rounded"
- autoComplete="off"
- value={fileSearch}
- onChange={e => setFileSearch(e.target.value)}
- />
- </div>
- <div className="flex-1 w-full h-full bg-[#09090b] border-t border-[#23232a]">
- <ScrollArea className="w-full h-full bg-[#09090b]" style={{
- height: '100%',
- maxHeight: '100%',
- paddingRight: 8,
- scrollbarGutter: 'stable',
- background: '#09090b'
- }}>
- <div className="p-2 pr-2">
- {connectingSSH || filesLoading ? (
- <div className="text-xs text-muted-foreground">Loading...</div>
- ) : filesError ? (
- <div className="text-xs text-red-500">{filesError}</div>
- ) : filteredFiles.length === 0 ? (
- <div className="text-xs text-muted-foreground">No files or
- folders found.</div>
- ) : (
- <div className="flex flex-col gap-1">
- {filteredFiles.map((item: any) => {
- const isOpen = (tabs || []).some((t: any) => t.id === item.path);
- return (
- <div
- key={item.path}
- className={cn(
- "flex items-center gap-2 px-3 py-2 bg-[#18181b] border border-[#23232a] rounded group max-w-full",
- isOpen && "opacity-60 cursor-not-allowed pointer-events-none"
- )}
- style={{maxWidth: 220, marginBottom: 8}}
+ <div className="flex flex-col h-full w-[256px]" style={{maxWidth: 256}}>
+ <div className="flex flex-col flex-grow min-h-0">
+ <div className="flex-1 w-full h-full flex flex-col bg-[#09090b] border-r-2 border-[#303032] overflow-hidden p-0 relative min-h-0">
+ {host && (
+ <div className="flex flex-col h-full w-full" style={{maxWidth: 260}}>
+ <div className="flex items-center gap-2 px-2 py-2 border-b-2 border-[#303032] bg-[#18181b] z-20" style={{maxWidth: 260}}>
+ <Button
+ size="icon"
+ variant="outline"
+ className="h-8 w-8 bg-[#18181b] border-2 border-[#303032] rounded-md hover:bg-[#2d2d30] focus:outline-none focus:ring-2 focus:ring-ring"
+ onClick={() => {
+ let path = currentPath;
+ if (path && path !== '/' && path !== '') {
+ if (path.endsWith('/')) path = path.slice(0, -1);
+ const lastSlash = path.lastIndexOf('/');
+ if (lastSlash > 0) {
+ setCurrentPath(path.slice(0, lastSlash));
+ } else {
+ setCurrentPath('/');
+ }
+ } else {
+ setCurrentPath('/');
+ }
+ }}
+ >
+ <ArrowUp className="w-4 h-4"/>
+ </Button>
+ <Input ref={pathInputRef} value={currentPath}
+ onChange={e => setCurrentPath(e.target.value)}
+ className="flex-1 bg-[#18181b] border border-[#434345] text-white truncate rounded-md px-2 py-1 focus:outline-none focus:ring-2 focus:ring-ring hover:border-[#5a5a5d]"
+ />
+ </div>
+ <div className="px-2 py-2 border-b-1 border-[#303032] bg-[#18181b]">
+ <Input
+ placeholder="Search files and folders..."
+ className="w-full h-7 text-sm bg-[#23232a] border border-[#434345] text-white placeholder:text-muted-foreground rounded"
+ autoComplete="off"
+ value={fileSearch}
+ onChange={e => setFileSearch(e.target.value)}
+ />
+ </div>
+ <div className="flex-1 w-full h-full bg-[#09090b] border-t-1 border-[#303032]">
+ <ScrollArea className="w-full h-full bg-[#09090b]" style={{
+ height: '100%',
+ maxHeight: '100%',
+ paddingRight: 8,
+ scrollbarGutter: 'stable',
+ background: '#09090b'
+ }}>
+ <div className="p-2 pr-2">
+ {connectingSSH || filesLoading ? (
+ <div className="text-xs text-muted-foreground">Loading...</div>
+ ) : filesError ? (
+ <div className="text-xs text-red-500">{filesError}</div>
+ ) : filteredFiles.length === 0 ? (
+ <div className="text-xs text-muted-foreground">No files or folders found.</div>
+ ) : (
+ <div className="flex flex-col gap-1">
+ {filteredFiles.map((item: any) => {
+ const isOpen = (tabs || []).some((t: any) => t.id === item.path);
+ return (
+ <div
+ key={item.path}
+ className={cn(
+ "flex items-center gap-2 px-3 py-2 bg-[#18181b] border-2 border-[#303032] rounded group max-w-full",
+ isOpen && "opacity-60 cursor-not-allowed pointer-events-none"
+ )}
+ style={{maxWidth: 220, marginBottom: 8}}
+ >
+ <div
+ className="flex items-center gap-2 flex-1 cursor-pointer min-w-0"
+ onClick={() => !isOpen && (item.type === 'directory' ? setCurrentPath(item.path) : onOpenFile({
+ name: item.name,
+ path: item.path,
+ isSSH: item.isSSH,
+ sshSessionId: item.sshSessionId
+ }))}
+ >
+ {item.type === 'directory' ?
+ <Folder className="w-4 h-4 text-blue-400"/> :
+ <File className="w-4 h-4 text-muted-foreground"/>}
+ <span className="text-sm text-white truncate max-w-[120px]">{item.name}</span>
+ </div>
+ <div className="flex items-center gap-1">
+ {item.type === 'file' && (
+ <Button size="icon" variant="ghost" className="h-7 w-7"
+ disabled={isOpen}
+ onClick={async (e) => {
+ e.stopPropagation();
+ try {
+ if (item.isPinned) {
+ await removeConfigEditorPinned({
+ name: item.name,
+ path: item.path,
+ hostId: host?.id,
+ isSSH: true,
+ sshSessionId: host?.id.toString()
+ });
+ setFiles(files.map(f =>
+ f.path === item.path ? { ...f, isPinned: false } : f
+ ));
+ } else {
+ await addConfigEditorPinned({
+ name: item.name,
+ path: item.path,
+ hostId: host?.id,
+ isSSH: true,
+ sshSessionId: host?.id.toString()
+ });
+ setFiles(files.map(f =>
+ f.path === item.path ? { ...f, isPinned: true } : f
+ ));
+ }
+ } catch (err) {
+ console.error('Failed to pin/unpin file:', err);
+ }
+ }}
>
- <div
- className="flex items-center gap-2 flex-1 cursor-pointer min-w-0"
- onClick={() => !isOpen && (item.type === 'directory' ? setCurrentPath(item.path) : onOpenFile({
- name: item.name,
- path: item.path,
- isSSH: item.isSSH,
- sshSessionId: item.sshSessionId
- }))}
- >
- {item.type === 'directory' ?
- <Folder
- className="w-4 h-4 text-blue-400"/> :
- <File
- className="w-4 h-4 text-muted-foreground"/>}
- <span
- className="text-sm text-white truncate max-w-[120px]">{item.name}</span>
- </div>
- <div className="flex items-center gap-1">
- {item.type === 'file' && (
- <Button size="icon" variant="ghost"
- className="h-7 w-7"
- disabled={isOpen}
- onClick={async (e) => {
- e.stopPropagation();
- try {
- if (item.isPinned) {
- await removeConfigEditorPinned({
- name: item.name,
- path: item.path,
- hostId: activeServer?.id,
- isSSH: true,
- sshSessionId: activeServer?.id.toString()
- });
- setFiles(files.map(f =>
- f.path === item.path ? {
- ...f,
- isPinned: false
- } : f
- ));
- } else {
- await addConfigEditorPinned({
- name: item.name,
- path: item.path,
- hostId: activeServer?.id,
- isSSH: true,
- sshSessionId: activeServer?.id.toString()
- });
- setFiles(files.map(f =>
- f.path === item.path ? {
- ...f,
- isPinned: true
- } : f
- ));
- }
- } catch (err) {
- console.error('Failed to pin/unpin file:', err);
- }
- }}
- >
- <Pin
- className={`w-1 h-1 ${item.isPinned ? 'text-yellow-400 fill-current' : 'text-muted-foreground'}`}/>
- </Button>
- )}
- </div>
- </div>
- );
- })}
+ <Pin className={`w-1 h-1 ${item.isPinned ? 'text-yellow-400 fill-current' : 'text-muted-foreground'}`}/>
+ </Button>
+ )}
+ </div>
</div>
- )}
- </div>
- </ScrollArea>
- </div>
+ );
+ })}
+ </div>
+ )}
</div>
- )}
+ </ScrollArea>
</div>
- </SidebarGroupContent>
- </SidebarGroup>
- </SidebarContent>
- </Sidebar>
- </SidebarProvider>
+ </div>
+ )}
+ </div>
+ </div>
+ </div>
);
});
export {ConfigEditorSidebar};
\ No newline at end of file
diff --git a/src/ui/SSH/Config Editor/ConfigFileSidebarViewer.tsx b/src/ui/SSH/Config Editor/ConfigFileSidebarViewer.tsx
index 99d3e7d84..251df2585 100644
--- a/src/ui/SSH/Config Editor/ConfigFileSidebarViewer.tsx
+++ b/src/ui/SSH/Config Editor/ConfigFileSidebarViewer.tsx
@@ -64,7 +64,7 @@ export function ConfigFileSidebarViewer({
return (
<div className="flex flex-col h-full">
{/* SSH Connections */}
- <div className="p-2 bg-[#18181b] border-b border-[#23232a]">
+ <div className="p-2 bg-[#18181b] border-b-2 border-[#303032]">
<div className="flex items-center justify-between mb-2">
<span className="text-xs text-muted-foreground font-semibold">SSH Connections</span>
<Button size="icon" variant="outline" onClick={onAddSSH} className="ml-2 h-7 w-7">
@@ -119,7 +119,7 @@ export function ConfigFileSidebarViewer({
<div className="flex flex-col gap-1">
{files.map((item) => (
<Card key={item.path}
- className="flex items-center gap-2 px-2 py-1 bg-[#18181b] border border-[#23232a] rounded">
+ className="flex items-center gap-2 px-2 py-1 bg-[#18181b] border-2 border-[#303032] rounded">
<div className="flex items-center gap-2 flex-1 cursor-pointer"
onClick={() => item.type === 'directory' ? onOpenFolder(item) : onOpenFile(item)}>
{item.type === 'directory' ? <Folder className="w-4 h-4 text-blue-400"/> :
diff --git a/src/ui/SSH/Config Editor/ConfigHomeView.tsx b/src/ui/SSH/Config Editor/ConfigHomeView.tsx
index 74bf34291..4fb20a8d2 100644
--- a/src/ui/SSH/Config Editor/ConfigHomeView.tsx
+++ b/src/ui/SSH/Config Editor/ConfigHomeView.tsx
@@ -49,7 +49,7 @@ export function ConfigHomeView({
const renderFileCard = (file: FileItem, onRemove: () => void, onPin?: () => void, isPinned = false) => (
<div key={file.path}
- className="flex items-center gap-2 px-3 py-2 bg-[#18181b] border border-[#23232a] rounded hover:border-[#434345] transition-colors">
+ className="flex items-center gap-2 px-3 py-2 bg-[#18181b] border-2 border-[#303032] rounded hover:border-[#434345] transition-colors">
<div
className="flex items-center gap-2 flex-1 cursor-pointer min-w-0"
onClick={() => onOpenFile(file)}
@@ -92,7 +92,7 @@ export function ConfigHomeView({
const renderShortcutCard = (shortcut: ShortcutItem) => (
<div key={shortcut.path}
- className="flex items-center gap-2 px-3 py-2 bg-[#18181b] border border-[#23232a] rounded hover:border-[#434345] transition-colors">
+ className="flex items-center gap-2 px-3 py-2 bg-[#18181b] border-2 border-[#303032] rounded hover:border-[#434345] transition-colors">
<div
className="flex items-center gap-2 flex-1 cursor-pointer min-w-0"
onClick={() => onOpenShortcut(shortcut)}
@@ -120,7 +120,7 @@ export function ConfigHomeView({
return (
<div className="p-4 flex flex-col gap-4 h-full bg-[#09090b]">
<Tabs value={tab} onValueChange={v => setTab(v as 'recent' | 'pinned' | 'shortcuts')} className="w-full">
- <TabsList className="mb-4 bg-[#18181b] border border-[#23232a]">
+ <TabsList className="mb-4 bg-[#18181b] border-2 border-[#303032]">
<TabsTrigger value="recent" className="data-[state=active]:bg-[#23232a]">Recent</TabsTrigger>
<TabsTrigger value="pinned" className="data-[state=active]:bg-[#23232a]">Pinned</TabsTrigger>
<TabsTrigger value="shortcuts" className="data-[state=active]:bg-[#23232a]">Folder
@@ -162,12 +162,12 @@ export function ConfigHomeView({
</TabsContent>
<TabsContent value="shortcuts" className="mt-0">
- <div className="flex items-center gap-3 mb-4 p-3 bg-[#18181b] border border-[#23232a] rounded-lg">
+ <div className="flex items-center gap-3 mb-4 p-3 bg-[#18181b] border-2 border-[#303032] rounded-lg">
<Input
placeholder="Enter folder path"
value={newShortcut}
onChange={e => setNewShortcut(e.target.value)}
- className="flex-1 bg-[#23232a] border-[#434345] text-white placeholder:text-muted-foreground"
+ className="flex-1 bg-[#23232a] border-2 border-[#303032] text-white placeholder:text-muted-foreground"
onKeyDown={(e) => {
if (e.key === 'Enter' && newShortcut.trim()) {
onAddShortcut(newShortcut.trim());
@@ -178,7 +178,7 @@ export function ConfigHomeView({
<Button
size="sm"
variant="outline"
- className="h-8 px-2 bg-[#23232a] border-[#434345] hover:bg-[#2d2d30] rounded-md"
+ className="h-8 px-2 bg-[#23232a] border-2 border-[#303032] hover:bg-[#2d2d30] rounded-md"
onClick={() => {
if (newShortcut.trim()) {
onAddShortcut(newShortcut.trim());
diff --git a/src/ui/SSH/Config Editor/ConfigTabList.tsx b/src/ui/SSH/Config Editor/ConfigTabList.tsx
index 37ae59627..cfaa13c61 100644
--- a/src/ui/SSH/Config Editor/ConfigTabList.tsx
+++ b/src/ui/SSH/Config Editor/ConfigTabList.tsx
@@ -21,7 +21,7 @@ export function ConfigTabList({tabs, activeTab, setActiveTab, closeTab, onHomeCl
<Button
onClick={onHomeClick}
variant="outline"
- className={`h-7 mr-[0.5rem] rounded-md flex items-center ${activeTab === 'home' ? '!bg-[#1d1d1f] !text-white !border-[#2d2d30] !hover:bg-[#1d1d1f] !active:bg-[#1d1d1f] !focus:bg-[#1d1d1f] !hover:text-white !active:text-white !focus:text-white' : ''}`}
+ className={`h-7 mr-[0.5rem] rounded-md flex items-center ${activeTab === 'home' ? '!bg-[#1d1d1f] !text-white !border-2 !border-[#303032] !hover:bg-[#1d1d1f] !active:bg-[#1d1d1f] !focus:bg-[#1d1d1f] !hover:text-white !active:text-white !focus:text-white' : ''}`}
>
<Home className="w-4 h-4"/>
</Button>
@@ -36,7 +36,7 @@ export function ConfigTabList({tabs, activeTab, setActiveTab, closeTab, onHomeCl
<Button
onClick={() => setActiveTab(tab.id)}
variant="outline"
- className={`h-7 rounded-r-none ${isActive ? '!bg-[#1d1d1f] !text-white !border-[#2d2d30] !hover:bg-[#1d1d1f] !active:bg-[#1d1d1f] !focus:bg-[#1d1d1f] !hover:text-white !active:text-white !focus:text-white' : ''}`}
+ className={`h-7 rounded-r-none ${isActive ? '!bg-[#1d1d1f] !text-white !border-2 !border-[#303032] !hover:bg-[#1d1d1f] !active:bg-[#1d1d1f] !focus:bg-[#1d1d1f] !hover:text-white !active:text-white !focus:text-white' : ''}`}
>
{tab.title}
</Button>
diff --git a/src/ui/SSH/Server/Server.tsx b/src/ui/SSH/Server/Server.tsx
index 72019f6dd..e2f22aa42 100644
--- a/src/ui/SSH/Server/Server.tsx
+++ b/src/ui/SSH/Server/Server.tsx
@@ -7,6 +7,7 @@ import { Progress } from "@/components/ui/progress"
import {Cpu, HardDrive, MemoryStick} from "lucide-react";
import {SSHTunnel} from "@/ui/SSH/Tunnel/SSHTunnel.tsx";
import { getServerStatusById, getServerMetricsById, ServerMetrics } from "@/ui/SSH/ssh-axios";
+import { useTabs } from "@/contexts/TabContext";
interface ServerProps {
hostConfig?: any;
@@ -18,6 +19,7 @@ interface ServerProps {
export function Server({ hostConfig, title, isVisible = true, isTopbarOpen = true, embedded = false }: ServerProps): React.ReactElement {
const { state: sidebarState } = useSidebar();
+ const { addTab } = useTabs() as any;
const [serverStatus, setServerStatus] = React.useState<'online' | 'offline'>('offline');
const [metrics, setMetrics] = React.useState<ServerMetrics | null>(null);
@@ -95,7 +97,22 @@ export function Server({ hostConfig, title, isVisible = true, isTopbarOpen = tru
</Status>
</div>
<div className="flex items-center">
- <Button variant="outline">File Manager</Button>
+ <Button
+ variant="outline"
+ onClick={() => {
+ if (!hostConfig) return;
+ const titleBase = hostConfig?.name && hostConfig.name.trim() !== ''
+ ? hostConfig.name.trim()
+ : `${hostConfig.username}@${hostConfig.ip}`;
+ addTab({
+ type: 'config',
+ title: titleBase,
+ hostConfig: hostConfig,
+ });
+ }}
+ >
+ File Manager
+ </Button>
</div>
</div>
<Separator className="p-0.25 w-full"/>