Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

Add bulk container stats and UI workspace revamp

Juan Denis31dd98497065
diff --git a/backend/app/api/docker.py b/backend/app/api/docker.py
index 61472814..db72d30b 100644
--- a/backend/app/api/docker.py
+++ b/backend/app/api/docker.py
@@ -169,6 +169,20 @@ def get_container_logs(container_id):
return jsonify(result), 200
+@docker_bp.route('/containers/stats', methods=['POST'])
+@jwt_required()
+def get_containers_stats():
+ """Get resource stats for multiple containers."""
+ data = request.get_json() or {}
+ container_ids = data.get('ids') or data.get('container_ids') or []
+
+ if not isinstance(container_ids, list):
+ return jsonify({'error': 'ids must be a list'}), 400
+
+ stats = DockerService.get_containers_stats(container_ids)
+ return jsonify({'stats': stats}), 200
+
+
@docker_bp.route('/containers/<container_id>/stats', methods=['GET'])
@jwt_required()
def get_container_stats(container_id):
diff --git a/backend/app/services/docker_service.py b/backend/app/services/docker_service.py
index a9a98ec4..883f27f9 100644
--- a/backend/app/services/docker_service.py
+++ b/backend/app/services/docker_service.py
@@ -489,6 +489,38 @@ class DockerService:
logger.error(f"Failed to get stats for container {container_id}: {e}")
return None
+ @staticmethod
+ def get_containers_stats(container_ids):
+ """Get resource usage stats for multiple containers in one Docker call."""
+ if not container_ids:
+ return {}
+
+ try:
+ cleaned_ids = [str(container_id) for container_id in container_ids if container_id]
+ if not cleaned_ids:
+ return {}
+
+ result = subprocess.run(
+ ['docker', 'stats', '--no-stream', '--format', '{{json .}}', *cleaned_ids],
+ capture_output=True, text=True
+ )
+ if result.returncode != 0:
+ logger.error(f"Failed to get container stats: {result.stderr.strip()}")
+ return {}
+
+ stats_map = {}
+ for line in result.stdout.splitlines():
+ if not line.strip():
+ continue
+ stats = json.loads(line)
+ for key in (stats.get('ID'), stats.get('Container'), stats.get('Name')):
+ if key:
+ stats_map[key] = stats
+ return stats_map
+ except Exception as e:
+ logger.error(f"Failed to get bulk container stats: {e}")
+ return {}
+
@staticmethod
def exec_command(container_id, command, interactive=False, tty=False):
"""Execute a command in a running container."""
diff --git a/frontend/src/pages/Docker.jsx b/frontend/src/pages/Docker.jsx
index 74d7bcdb..cb43b983 100644
--- a/frontend/src/pages/Docker.jsx
+++ b/frontend/src/pages/Docker.jsx
@@ -1,10 +1,9 @@
-import React, { useState, useEffect, useMemo, useRef, createContext, useContext } from 'react';
+import React, { useState, useEffect, useMemo, useRef, useCallback, createContext, useContext } from 'react';
import useTabParam from '../hooks/useTabParam';
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { useConfirm } from '../hooks/useConfirm';
import { ConfirmDialog } from '../components/ConfirmDialog';
-import TargetPicker from '../components/TargetPicker';
import LogToolbar from '../components/log-viewer/LogToolbar';
import LogContent from '../components/log-viewer/LogContent';
import { Button } from '@/components/ui/button';
@@ -13,7 +12,7 @@ import { Textarea } from '@/components/ui/textarea';
import {
Box, Layers, HardDrive, Network as NetworkIcon, Search, X, RefreshCw,
Trash2, Play, Square, RotateCw, Terminal as TerminalLucide, FileText,
- Activity, Clock3, Copy, Database, Gauge, Info, Package, Server as ServerIcon,
+ Activity, Clock3, Copy, Database, Gauge, Package, Server as ServerIcon, ArrowUpDown,
} from 'lucide-react';
// Server context for Docker operations
@@ -21,6 +20,7 @@ const ServerContext = createContext({ serverId: 'local', serverName: 'Local' });
const useServer = () => useContext(ServerContext);
const VALID_TABS = ['containers', 'compose', 'images', 'volumes', 'networks'];
+const LOCAL_DOCKER_TARGET = { id: 'local', name: 'Local (this server)', status: 'online', is_local: true };
const unwrapRemoteData = (response) => {
if (response?.success && response.data !== undefined) {
@@ -108,7 +108,8 @@ const Docker = () => {
const [activeTab, setActiveTab] = useTabParam('/docker', VALID_TABS);
const [dockerStatus, setDockerStatus] = useState(null);
const [loading, setLoading] = useState(true);
- const [selectedServer, setSelectedServer] = useState({ id: 'local', name: 'Local (this server)' });
+ const [selectedServer, setSelectedServer] = useState(LOCAL_DOCKER_TARGET);
+ const [availableServers, setAvailableServers] = useState([LOCAL_DOCKER_TARGET]);
const [stats, setStats] = useState({
containers: { total: 0, running: 0, stopped: 0 },
images: { total: 0, size: '0 B' },
@@ -120,6 +121,31 @@ const Docker = () => {
checkDockerStatus();
}, [selectedServer]); // eslint-disable-line react-hooks/exhaustive-deps
+ useEffect(() => {
+ let cancelled = false;
+
+ async function loadAvailableServers() {
+ try {
+ const data = await api.getAvailableServers();
+ const servers = Array.isArray(data) && data.length > 0 ? data : [LOCAL_DOCKER_TARGET];
+ if (cancelled) return;
+ setAvailableServers(servers);
+ setSelectedServer(prev => (
+ servers.some(server => server.id === prev.id)
+ ? prev
+ : (servers[0] || LOCAL_DOCKER_TARGET)
+ ));
+ } catch {
+ if (cancelled) return;
+ setAvailableServers([LOCAL_DOCKER_TARGET]);
+ setSelectedServer(LOCAL_DOCKER_TARGET);
+ }
+ }
+
+ loadAvailableServers();
+ return () => { cancelled = true; };
+ }, []);
+
async function checkDockerStatus() {
setLoading(true);
try {
@@ -272,13 +298,16 @@ const Docker = () => {
}
const tabs = [
- { id: 'containers', label: 'Containers' },
- { id: 'compose', label: 'Compose' },
- { id: 'images', label: 'Images' },
- { id: 'volumes', label: 'Volumes' },
- { id: 'networks', label: 'Networks' }
+ { id: 'containers', label: 'Containers', icon: Box, count: stats.containers.total },
+ { id: 'compose', label: 'Compose', icon: Package, count: null },
+ { id: 'images', label: 'Images', icon: Layers, count: stats.images.total },
+ { id: 'volumes', label: 'Volumes', icon: HardDrive, count: stats.volumes.total },
+ { id: 'networks', label: 'Networks', icon: NetworkIcon, count: stats.networks.total }
];
+ const activeTabMeta = tabs.find(tab => tab.id === activeTab) || tabs[0];
+ const hasMultipleTargets = availableServers.length > 1;
+
const serverContextValue = {
serverId: selectedServer.id,
serverName: selectedServer.name,
@@ -288,100 +317,112 @@ const Docker = () => {
return (
<ServerContext.Provider value={serverContextValue}>
<div className="page-container page-container--full-bleed docker-page-new dx-page">
- <div className="page-header">
- <div className="page-header-content">
- <h1>Docker</h1>
- <p className="page-description">Manage containers, images, networks, and volumes</p>
- </div>
- <div className="page-header-actions">
- {activeTab === 'containers' && <RunContainerButton />}
- {activeTab === 'images' && <PullImageButton />}
- {activeTab === 'networks' && <CreateNetworkButton />}
- {activeTab === 'volumes' && <CreateVolumeButton />}
- </div>
- </div>
+ <div className="dx-workspace">
+ <aside className="dx-docker-sidebar">
+ {hasMultipleTargets && (
+ <section className="dx-sidebar-section">
+ <div className="dx-sidebar-section-header">
+ <ServerIcon size={14} />
+ <span>Targets</span>
+ </div>
+ <div className="dx-resource-nav">
+ {availableServers.map(server => (
+ <button
+ key={server.id}
+ className={`dx-resource-nav-item ${selectedServer.id === server.id ? 'active' : ''}`}
+ onClick={() => setSelectedServer(server)}
+ >
+ <ServerIcon size={15} />
+ <span>{server.name || server.hostname || server.id}</span>
+ <strong>{server.status || 'online'}</strong>
+ </button>
+ ))}
+ </div>
+ </section>
+ )}
- <div className="lv-header">
- <div className="lv-header-target">
- <span className="lv-header-label">Server</span>
- <TargetPicker
- feature="docker"
- value={selectedServer.id === 'local'
- ? { kind: 'local' }
- : { kind: 'agent', server_id: selectedServer.id, name: selectedServer.name }}
- onChange={(v) => {
- if (v.kind === 'local') setSelectedServer({ id: 'local', name: 'Local (this server)' });
- else setSelectedServer({ id: v.server_id, name: v.name });
- }}
- />
- </div>
- <div className="lv-header-stats">
- <PruneButton onPruned={loadStats} />
- </div>
- </div>
+ <section className="dx-sidebar-section">
+ <div className="dx-sidebar-section-header">
+ <Box size={14} />
+ <span>Resources</span>
+ </div>
+ <div className="dx-resource-nav">
+ {tabs.map(tab => {
+ const Icon = tab.icon;
+ return (
+ <button
+ key={tab.id}
+ className={`dx-resource-nav-item ${activeTab === tab.id ? 'active' : ''}`}
+ onClick={() => setActiveTab(tab.id)}
+ >
+ <Icon size={15} />
+ <span>{tab.label}</span>
+ {tab.count !== null && <strong>{tab.count}</strong>}
+ </button>
+ );
+ })}
+ </div>
+ </section>
- <div className="dx-stats-row">
- <div className="dx-stat" data-kind="containers">
- <div className="dx-stat-icon"><Box size={18} /></div>
- <div className="dx-stat-body">
- <div className="dx-stat-label">Containers</div>
- <div className="dx-stat-value">{stats.containers.total}</div>
- <div className="dx-stat-meta">
- <span className="dx-pill running"><span className="dot" />{stats.containers.running} running</span>
- <span className="dx-pill stopped"><span className="dot" />{stats.containers.stopped} stopped</span>
+ <section className="dx-sidebar-section">
+ <div className="dx-sidebar-section-header">
+ <Activity size={14} />
+ <span>Inventory</span>
</div>
- </div>
- </div>
- <div className="dx-stat" data-kind="images">
- <div className="dx-stat-icon"><Layers size={18} /></div>
- <div className="dx-stat-body">
- <div className="dx-stat-label">Images</div>
- <div className="dx-stat-value">{stats.images.total}</div>
- <div className="dx-stat-meta">
- <span className="dx-stat-sub">{stats.images.size} on disk</span>
+ <div className="dx-inventory-list">
+ <div className="dx-inventory-item">
+ <span>Running</span>
+ <strong>{stats.containers.running}</strong>
+ </div>
+ <div className="dx-inventory-item">
+ <span>Stopped</span>
+ <strong>{stats.containers.stopped}</strong>
+ </div>
+ <div className="dx-inventory-item">
+ <span>Images</span>
+ <strong>{stats.images.size}</strong>
+ </div>
+ <div className="dx-inventory-item">
+ <span>Volumes</span>
+ <strong>{stats.volumes.total}</strong>
+ </div>
</div>
- </div>
- </div>
- <div className="dx-stat" data-kind="volumes">
- <div className="dx-stat-icon"><HardDrive size={18} /></div>
- <div className="dx-stat-body">
- <div className="dx-stat-label">Volumes</div>
- <div className="dx-stat-value">{stats.volumes.total}</div>
- <div className="dx-stat-meta">
- <span className="dx-stat-sub">Persistent data</span>
+ </section>
+
+ <section className="dx-sidebar-section">
+ <div className="dx-sidebar-section-header">
+ <Trash2 size={14} />
+ <span>Maintenance</span>
</div>
- </div>
- </div>
- <div className="dx-stat" data-kind="networks">
- <div className="dx-stat-icon"><NetworkIcon size={18} /></div>
- <div className="dx-stat-body">
- <div className="dx-stat-label">Networks</div>
- <div className="dx-stat-value">{stats.networks.total}</div>
- <div className="dx-stat-meta">
- <span className="dx-stat-sub">Bridge · Host · None</span>
+ <div className="dx-sidebar-section-content">
+ <PruneButton onPruned={loadStats} />
+ </div>
+ </section>
+ </aside>
+
+ <main className="dx-main">
+ <div className="dx-workbar">
+ <div className="dx-workbar-title">
+ <span>Docker</span>
+ <strong>{activeTabMeta.label}</strong>
+ {hasMultipleTargets && <em>{selectedServer.name || selectedServer.id}</em>}
+ </div>
+ <div className="dx-workbar-actions">
+ {activeTab === 'containers' && <RunContainerButton />}
+ {activeTab === 'images' && <PullImageButton />}
+ {activeTab === 'networks' && <CreateNetworkButton />}
+ {activeTab === 'volumes' && <CreateVolumeButton />}
</div>
</div>
- </div>
- </div>
-
- <div className="dx-tabs">
- {tabs.map(tab => (
- <button
- key={tab.id}
- className={`dx-tab ${activeTab === tab.id ? 'active' : ''}`}
- onClick={() => setActiveTab(tab.id)}
- >
- {tab.label}
- </button>
- ))}
- </div>
- <div className="dx-panel">
- {activeTab === 'containers' && <ContainersTab onStatsChange={loadStats} />}
- {activeTab === 'compose' && <ComposeTab onStatsChange={loadStats} />}
- {activeTab === 'images' && <ImagesTab onStatsChange={loadStats} />}
- {activeTab === 'networks' && <NetworksTab onStatsChange={loadStats} />}
- {activeTab === 'volumes' && <VolumesTab onStatsChange={loadStats} />}
+ <div className="dx-panel">
+ {activeTab === 'containers' && <ContainersTab onStatsChange={loadStats} />}
+ {activeTab === 'compose' && <ComposeTab onStatsChange={loadStats} />}
+ {activeTab === 'images' && <ImagesTab onStatsChange={loadStats} />}
+ {activeTab === 'networks' && <NetworksTab onStatsChange={loadStats} />}
+ {activeTab === 'volumes' && <VolumesTab onStatsChange={loadStats} />}
+ </div>
+ </main>
</div>
</div>
</ServerContext.Provider>
@@ -533,11 +574,92 @@ const ContainersTab = ({ onStatsChange }) => {
const [execContainer, setExecContainer] = useState(null);
const [searchTerm, setSearchTerm] = useState('');
const [statusFilter, setStatusFilter] = useState('all');
+ const [sortKey, setSortKey] = useState('status');
+ const [sortDirection, setSortDirection] = useState('asc');
+ const statsRequestSeq = useRef(0);
useEffect(() => {
loadContainers();
}, [showAll, serverId]); // eslint-disable-line react-hooks/exhaustive-deps
+ const fetchContainerStats = useCallback(async (container) => {
+ const containerId = getContainerId(container);
+ if (!containerId) return null;
+
+ if (isRemote) {
+ const result = await api.getRemoteContainerStats(serverId, containerId);
+ const payload = unwrapRemoteData(result);
+ return payload?.stats || payload;
+ }
+
+ const statsData = await api.getContainerStats(containerId);
+ return statsData.stats;
+ }, [isRemote, serverId]);
+
+ const refreshContainerStats = useCallback(async (containerList, requestSeq = statsRequestSeq.current) => {
+ const runningContainers = containerList.filter(isContainerRunning);
+ if (runningContainers.length === 0) return;
+
+ if (!isRemote) {
+ const containerIds = runningContainers.map(getContainerId).filter(Boolean);
+ if (containerIds.length === 0) return;
+
+ const resolveStats = (statsMap, container) => {
+ const containerId = getContainerId(container);
+ const containerName = getContainerName(container);
+ return statsMap[containerId] ||
+ statsMap[containerName] ||
+ statsMap[`/${containerName}`] ||
+ null;
+ };
+
+ try {
+ const statsData = await api.getContainersStats(containerIds);
+ if (requestSeq !== statsRequestSeq.current) return;
+ const statsMap = statsData?.stats || {};
+ setContainerStats(prev => {
+ const next = { ...prev };
+ runningContainers.forEach(container => {
+ next[getContainerId(container)] = resolveStats(statsMap, container);
+ });
+ return next;
+ });
+ } catch {
+ if (requestSeq !== statsRequestSeq.current) return;
+ setContainerStats(prev => {
+ const next = { ...prev };
+ runningContainers.forEach(container => {
+ next[getContainerId(container)] = null;
+ });
+ return next;
+ });
+ }
+ return;
+ }
+
+ await Promise.all(runningContainers.map(async (container) => {
+ const containerId = getContainerId(container);
+ try {
+ const stats = await fetchContainerStats(container);
+ if (requestSeq !== statsRequestSeq.current || !stats) return;
+ setContainerStats(prev => ({ ...prev, [containerId]: stats }));
+ } catch {
+ if (requestSeq !== statsRequestSeq.current) return;
+ setContainerStats(prev => ({ ...prev, [containerId]: null }));
+ }
+ }));
+ }, [fetchContainerStats, isRemote]);
+
+ useEffect(() => {
+ if (loading || containers.length === 0) return undefined;
+
+ const timer = window.setInterval(() => {
+ refreshContainerStats(containers, statsRequestSeq.current);
+ }, 10000);
+
+ return () => window.clearInterval(timer);
+ }, [containers, loading, refreshContainerStats]);
+
async function loadContainers() {
setLoading(true);
try {
@@ -549,38 +671,15 @@ const ContainersTab = ({ onStatsChange }) => {
data = await api.getContainers(showAll);
}
const containerList = data.containers || [];
+ const requestSeq = ++statsRequestSeq.current;
setContainers(containerList);
setContainerStats({});
setSelectedContainer(prev => {
- if (!containerList.length) return null;
- if (!prev) return containerList[0];
- return containerList.find(c => getContainerId(c) === getContainerId(prev)) || containerList[0];
+ if (!containerList.length || !prev) return null;
+ return containerList.find(c => getContainerId(c) === getContainerId(prev)) || null;
});
setLoading(false);
-
- // Load stats for running containers
- const runningContainers = containerList.filter(isContainerRunning);
- const statsPromises = runningContainers.map(async (c) => {
- try {
- let statsData;
- if (isRemote) {
- const result = await api.getRemoteContainerStats(serverId, getContainerId(c));
- statsData = { stats: unwrapRemoteData(result) };
- } else {
- statsData = await api.getContainerStats(getContainerId(c));
- }
- return { id: getContainerId(c), stats: statsData.stats };
- } catch {
- return { id: getContainerId(c), stats: null };
- }
- });
-
- const statsResults = await Promise.all(statsPromises);
- const statsMap = {};
- statsResults.forEach(({ id, stats }) => {
- if (stats) statsMap[id] = stats;
- });
- setContainerStats(statsMap);
+ refreshContainerStats(containerList, requestSeq);
} catch (err) {
console.error('Failed to load containers:', err);
setLoading(false);
@@ -629,17 +728,18 @@ const ContainersTab = ({ onStatsChange }) => {
}
function parseStats(stats) {
- if (!stats) return { cpu: 0, memory: 0 };
-
- // CPU comes as "0.12%" format
- const cpuStr = stats.CPUPerc || stats.cpu_percent || '0%';
- const cpu = parseFloat(cpuStr.replace('%', '')) || 0;
-
- // Memory comes as "0.12%" format
- const memStr = stats.MemPerc || stats.memory_percent || '0%';
- const memory = parseFloat(memStr.replace('%', '')) || 0;
-
- return { cpu, memory };
+ if (!stats) return { cpu: 0, memory: 0, available: false };
+ const source = stats.stats || stats;
+ const parsePercent = (value) => {
+ if (typeof value === 'number') return value;
+ if (value === null || value === undefined) return 0;
+ return parseFloat(String(value).replace('%', '')) || 0;
+ };
+
+ const cpu = parsePercent(source.CPUPerc ?? source.cpu_percent ?? source.cpu?.percent);
+ const memory = parsePercent(source.MemPerc ?? source.memory_percent ?? source.memory?.percent);
+
+ return { cpu, memory, available: true };
}
const counts = useMemo(() => {
@@ -648,19 +748,52 @@ const ContainersTab = ({ onStatsChange }) => {
return c;
}, [containers]);
- const filteredContainers = containers.filter(c => {
- if (statusFilter === 'running' && !isContainerRunning(c)) return false;
- if (statusFilter === 'stopped' && isContainerRunning(c)) return false;
- if (!searchTerm) return true;
+ const filteredContainers = useMemo(() => {
const search = searchTerm.toLowerCase();
- return getContainerName(c).toLowerCase().includes(search) ||
- getContainerId(c).toLowerCase().includes(search) ||
- getContainerImage(c).toLowerCase().includes(search);
- });
+ const filtered = containers.filter(c => {
+ if (statusFilter === 'running' && !isContainerRunning(c)) return false;
+ if (statusFilter === 'stopped' && isContainerRunning(c)) return false;
+ if (!search) return true;
+ return getContainerName(c).toLowerCase().includes(search) ||
+ getContainerId(c).toLowerCase().includes(search) ||
+ getContainerImage(c).toLowerCase().includes(search);
+ });
+
+ const direction = sortDirection === 'asc' ? 1 : -1;
+ const statusRank = (container) => isContainerRunning(container) ? 0 : 1;
+ const createdTime = (container) => {
+ const raw = container.created || container.CreatedAt || '';
+ const parsed = Date.parse(raw);
+ return Number.isNaN(parsed) ? 0 : parsed;
+ };
+
+ return [...filtered].sort((a, b) => {
+ const statsA = parseStats(containerStats[getContainerId(a)]);
+ const statsB = parseStats(containerStats[getContainerId(b)]);
+ let result = 0;
+
+ if (sortKey === 'status') {
+ result = statusRank(a) - statusRank(b) ||
+ getContainerStatus(a).localeCompare(getContainerStatus(b));
+ } else if (sortKey === 'name') {
+ result = getContainerName(a).localeCompare(getContainerName(b));
+ } else if (sortKey === 'image') {
+ result = getContainerImage(a).localeCompare(getContainerImage(b));
+ } else if (sortKey === 'cpu') {
+ result = statsA.cpu - statsB.cpu;
+ } else if (sortKey === 'memory') {
+ result = statsA.memory - statsB.memory;
+ } else if (sortKey === 'created') {
+ result = createdTime(a) - createdTime(b);
+ }
+
+ return result * direction;
+ });
+ }, [containers, statusFilter, searchTerm, sortKey, sortDirection, containerStats]);
const selectedStats = selectedContainer
? parseStats(containerStats[getContainerId(selectedContainer)])
- : { cpu: 0, memory: 0 };
+ : { cpu: 0, memory: 0, available: false };
if (loading) {
return (
@@ -691,6 +824,24 @@ const ContainersTab = ({ onStatsChange }) => {
))}
</div>
<div className="dx-tab-toolbar-right">
+ <div className="dx-sort-control">
+ <span>Sort</span>
+ <select value={sortKey} onChange={(e) => setSortKey(e.target.value)}>
+ <option value="status">Status</option>
+ <option value="name">Name</option>
+ <option value="image">Image</option>
+ <option value="cpu">CPU</option>
+ <option value="memory">RAM</option>
+ <option value="created">Created</option>
+ </select>
+ <button
+ className="lv-icon-btn"
+ onClick={() => setSortDirection(prev => prev === 'asc' ? 'desc' : 'asc')}
+ title={`Sort ${sortDirection === 'asc' ? 'ascending' : 'descending'}`}
+ >
+ <ArrowUpDown size={13} />
+ </button>
+ </div>
<label className="dx-toggle">
<input
type="checkbox"
@@ -827,17 +978,20 @@ const ContainersTab = ({ onStatsChange }) => {
</table>
</div>
</section>
-
- <ContainerInspector
- container={selectedContainer}
- stats={selectedStats}
- onAction={handleAction}
- onOpenLogs={setLogsContainer}
- onOpenExec={setExecContainer}
- />
</div>
)}
+ {selectedContainer && (
+ <ContainerInspector
+ container={selectedContainer}
+ stats={selectedStats}
+ onAction={handleAction}
+ onOpenLogs={setLogsContainer}
+ onOpenExec={setExecContainer}
+ onClose={() => setSelectedContainer(null)}
+ />
+ )}
+
{logsContainer && (
<ContainerLogsModal
container={logsContainer}
@@ -866,20 +1020,20 @@ const ContainersTab = ({ onStatsChange }) => {
};
const ContainerResourceBars = ({ stats, muted = false }) => (
- <div className={`dx-mini-resources ${muted ? 'is-muted' : ''}`}>
+ <div className={`dx-mini-resources ${muted || !stats.available ? 'is-muted' : ''}`}>
<div className="dx-mini-resource">
<span>CPU</span>
<div className="dx-res-track">
- <div className="dx-res-fill cpu" style={{ width: `${Math.min(stats.cpu, 100)}%` }} />
+ <div className="dx-res-fill cpu" style={{ width: `${stats.available ? Math.min(stats.cpu, 100) : 0}%` }} />
</div>
- <strong>{stats.cpu.toFixed(1)}%</strong>
+ <strong>{stats.available ? `${stats.cpu.toFixed(1)}%` : '--'}</strong>
</div>
<div className="dx-mini-resource">
<span>RAM</span>
<div className="dx-res-track">
- <div className="dx-res-fill mem" style={{ width: `${Math.min(stats.memory, 100)}%` }} />
+ <div className="dx-res-fill mem" style={{ width: `${stats.available ? Math.min(stats.memory, 100) : 0}%` }} />
</div>
- <strong>{stats.memory.toFixed(1)}%</strong>
+ <strong>{stats.available ? `${stats.memory.toFixed(1)}%` : '--'}</strong>
</div>
</div>
);
@@ -893,7 +1047,7 @@ const maskEnvValue = (entry) => {
return entry;
};
-const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec }) => {
+const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec, onClose }) => {
const toast = useToast();
const { serverId, isRemote } = useServer();
const [details, setDetails] = useState(null);
@@ -903,6 +1057,7 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
useEffect(() => {
let mounted = true;
+ let loadingTimer;
async function loadDetails() {
if (!container) {
@@ -911,6 +1066,9 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
}
setLoading(true);
+ loadingTimer = window.setTimeout(() => {
+ if (mounted) setLoading(false);
+ }, 2500);
setActiveSection('overview');
try {
let data;
@@ -925,22 +1083,20 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
console.error('Failed to inspect container:', err);
if (mounted) setDetails(null);
} finally {
+ window.clearTimeout(loadingTimer);
if (mounted) setLoading(false);
}
}
loadDetails();
- return () => { mounted = false; };
+ return () => {
+ mounted = false;
+ window.clearTimeout(loadingTimer);
+ };
}, [container, containerId, serverId, isRemote]);
if (!container) {
- return (
- <aside className="dx-inspector dx-inspector-empty">
- <Info size={24} />
- <h3>Select a container</h3>
- <p>Use the list to inspect ports, mounts, networks, labels, and live resource usage.</p>
- </aside>
- );
+ return null;
}
const isRunning = isContainerRunning(container);
@@ -963,7 +1119,9 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
}
return (
- <aside className="dx-inspector">
+ <>
+ <div className="dx-drawer-backdrop" onClick={onClose} />
+ <aside className="dx-inspector dx-inspector-drawer">
<div className="dx-inspector-header">
<div className="dx-inspector-icon">
<Box size={18} />
@@ -975,6 +1133,9 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
<button className="dx-row-action" onClick={copyContainerId} title="Copy container ID">
<Copy size={13} />
</button>
+ <button className="dx-row-action" onClick={onClose} title="Close details">
+ <X size={13} />
+ </button>
</div>
<div className="dx-inspector-status">
@@ -1115,6 +1276,7 @@ const ContainerInspector = ({ container, stats, onAction, onOpenLogs, onOpenExec
)}
</div>
</aside>
+ </>
);
};
diff --git a/frontend/src/services/api/docker.js b/frontend/src/services/api/docker.js
index 7ad29d19..7fbe86dc 100644
--- a/frontend/src/services/api/docker.js
+++ b/frontend/src/services/api/docker.js
@@ -71,6 +71,13 @@ export async function getContainerStats(containerId) {
return this.request(`/docker/containers/${containerId}/stats`);
}
+export async function getContainersStats(containerIds) {
+ return this.request('/docker/containers/stats', {
+ method: 'POST',
+ body: { ids: containerIds }
+ });
+}
+
export async function execContainer(containerId, command) {
return this.request(`/docker/containers/${containerId}/exec`, {
method: 'POST',
diff --git a/frontend/src/styles/pages/_docker.scss b/frontend/src/styles/pages/_docker.scss
index 755047d3..7127aec7 100644
--- a/frontend/src/styles/pages/_docker.scss
+++ b/frontend/src/styles/pages/_docker.scss
@@ -1731,3 +1731,404 @@
grid-template-columns: 1fr;
}
}
+
+// Docker workspace polish: File Manager-style rail + click-open details drawer
+.docker-page-new.dx-page {
+ padding: $space-3;
+ gap: $space-3;
+ background: transparent;
+
+ .page-header,
+ .lv-header,
+ .dx-stats-row,
+ .dx-tabs {
+ display: none;
+ }
+}
+
+.dx-workspace {
+ flex: 1;
+ min-height: 0;
+ display: grid;
+ grid-template-columns: 252px minmax(0, 1fr);
+ gap: $space-3;
+ overflow: hidden;
+}
+
+.dx-docker-sidebar {
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+ min-height: 0;
+ overflow-y: auto;
+ scrollbar-width: thin;
+
+ &::-webkit-scrollbar { width: 4px; }
+ &::-webkit-scrollbar-thumb { background: $border-default; border-radius: $radius-sm; }
+}
+
+.dx-sidebar-section {
+ background: $bg-card;
+ border: 1px solid $border-default;
+ border-radius: $radius-lg;
+ overflow: hidden;
+ flex-shrink: 0;
+}
+
+.dx-sidebar-section-header {
+ display: flex;
+ align-items: center;
+ gap: $space-2;
+ padding: $space-3;
+ background: $bg-elevated;
+ border-bottom: 1px solid $border-subtle;
+ color: $text-primary;
+ font-size: $font-size-sm;
+ font-weight: $font-weight-medium;
+
+ svg {
+ color: $accent-primary;
+ flex-shrink: 0;
+ }
+}
+
+.dx-sidebar-section-content {
+ padding: $space-2;
+
+ .btn,
+ button {
+ width: 100%;
+ justify-content: center;
+ }
+}
+
+.dx-resource-nav {
+ display: grid;
+ gap: 2px;
+ padding: $space-2;
+}
+
+.dx-resource-nav-item {
+ display: grid;
+ grid-template-columns: 18px minmax(0, 1fr) auto;
+ align-items: center;
+ gap: $space-2;
+ width: 100%;
+ min-height: 34px;
+ padding: 0 $space-2;
+ border: none;
+ border-radius: $radius-md;
+ background: transparent;
+ color: $text-secondary;
+ font-size: $font-size-sm;
+ text-align: left;
+ cursor: pointer;
+ @include transition(all);
+
+ svg {
+ color: $text-tertiary;
+ }
+
+ span {
+ @include truncate();
+ }
+
+ strong {
+ min-width: 24px;
+ padding: 1px 7px;
+ border-radius: $radius-full;
+ background: $bg-tertiary;
+ color: $text-tertiary;
+ font-family: $font-mono;
+ font-size: 10px;
+ font-weight: $font-weight-medium;
+ text-align: center;
+ }
+
+ &:hover {
+ background: $bg-hover;
+ color: $text-primary;
+ }
+
+ &.active {
+ background: $accent-glow;
+ color: $accent-primary;
+
+ svg { color: $accent-primary; }
+ strong {
+ background: fade($accent-primary-raw, 18%);
+ color: $accent-primary;
+ }
+ }
+}
+
+.dx-inventory-list {
+ display: grid;
+ gap: 1px;
+ padding: $space-2;
+}
+
+.dx-inventory-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: $space-2;
+ min-height: 30px;
+ padding: 0 $space-2;
+ border-radius: $radius-md;
+
+ span {
+ color: $text-secondary;
+ font-size: $font-size-xs;
+ }
+
+ strong {
+ color: $text-primary;
+ font-family: $font-mono;
+ font-size: $font-size-xs;
+ font-weight: $font-weight-medium;
+ @include truncate();
+ }
+}
+
+.dx-main {
+ min-width: 0;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ gap: $space-2;
+}
+
+.dx-workbar {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: $space-3;
+ min-height: 46px;
+ padding: $space-2;
+ background: $bg-card;
+ border: 1px solid $border-default;
+ border-radius: $radius-lg;
+ flex-shrink: 0;
+}
+
+.dx-workbar-title {
+ display: flex;
+ align-items: baseline;
+ gap: $space-2;
+ min-width: 0;
+
+ span {
+ color: $text-tertiary;
+ font-size: 10px;
+ font-weight: $font-weight-semibold;
+ text-transform: uppercase;
+ letter-spacing: 0.06em;
+ }
+
+ strong {
+ color: $text-primary;
+ font-size: $font-size-base;
+ font-weight: $font-weight-semibold;
+ }
+
+ em {
+ color: $text-tertiary;
+ font-size: $font-size-xs;
+ font-style: normal;
+ @include truncate();
+ }
+}
+
+.dx-workbar-actions {
+ display: flex;
+ align-items: center;
+ gap: $space-2;
+ flex-wrap: wrap;
+
+ .btn,
+ button {
+ min-height: 32px;
+ }
+}
+
+.dx-panel {
+ flex: 1;
+ min-height: 0;
+ background: transparent;
+ border: none;
+ border-radius: 0;
+ box-shadow: none;
+}
+
+.dx-tab-pane {
+ padding: 0;
+}
+
+.dx-containers-pane {
+ gap: $space-2;
+}
+
+.dx-tab-toolbar {
+ margin: 0;
+ padding: $space-2;
+ background: $bg-card;
+ border: 1px solid $border-default;
+ border-radius: $radius-lg;
+}
+
+.dx-tab-toolbar-right {
+ margin-left: auto;
+}
+
+.dx-sort-control {
+ display: inline-flex;
+ align-items: center;
+ gap: $space-1;
+
+ span {
+ color: $text-tertiary;
+ font-size: $font-size-xs;
+ font-weight: $font-weight-semibold;
+ }
+
+ select {
+ height: 32px;
+ min-width: 108px;
+ padding: 0 $space-6 0 $space-2;
+ border: 1px solid $border-default;
+ border-radius: $radius-md;
+ background: $bg-elevated;
+ color: $text-primary;
+ font-size: $font-size-xs;
+ outline: none;
+
+ &:focus {
+ border-color: $accent-primary;
+ box-shadow: 0 0 0 2px $accent-glow;
+ }
+ }
+}
+
+.dx-manager-layout {
+ grid-template-columns: minmax(0, 1fr);
+ gap: 0;
+}
+
+.dx-resource-list {
+ background: $bg-card;
+ border-color: $border-default;
+}
+
+.dx-table-wrap {
+ background: $bg-card;
+}
+
+.dx-manager-table {
+ th {
+ background: $bg-elevated;
+ }
+
+ th,
+ td {
+ padding: $space-3;
+ }
+
+ tbody tr {
+ background: $bg-card;
+
+ &:hover {
+ background: $bg-hover;
+ }
+
+ &.is-selected {
+ background: $accent-glow;
+ }
+ }
+}
+
+.dx-drawer-backdrop {
+ position: fixed;
+ inset: 0;
+ background: rgba(0, 0, 0, 0.08);
+ backdrop-filter: none;
+ z-index: $z-modal-backdrop;
+ animation: drawer-fade 0.18s ease;
+}
+
+.dx-inspector-drawer {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ width: min(540px, 100vw);
+ max-width: 100%;
+ box-sizing: border-box;
+ background: $bg-card;
+ border: none;
+ border-left: 1px solid $border-default;
+ border-radius: 0;
+ box-shadow: -10px 0 36px rgba(0, 0, 0, 0.42);
+ z-index: $z-modal;
+ animation: drawer-slide 0.24s cubic-bezier(0.32, 0.72, 0.24, 1);
+}
+
+@keyframes drawer-fade {
+ from { opacity: 0; }
+ to { opacity: 1; }
+}
+
+@keyframes drawer-slide {
+ from { transform: translateX(100%); }
+ to { transform: translateX(0); }
+}
+
+@media (max-width: $breakpoint-xl) {
+ .dx-workspace {
+ grid-template-columns: 220px minmax(0, 1fr);
+ }
+}
+
+@media (max-width: $breakpoint-lg) {
+ .dx-workspace {
+ grid-template-columns: 1fr;
+ overflow: auto;
+ }
+
+ .dx-docker-sidebar {
+ display: grid;
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ overflow: visible;
+ }
+
+ .dx-main {
+ min-height: 620px;
+ }
+}
+
+@media (max-width: $breakpoint-md) {
+ .dx-docker-sidebar {
+ grid-template-columns: 1fr;
+ }
+
+ .dx-workbar {
+ align-items: stretch;
+ flex-direction: column;
+ }
+
+ .dx-workbar-actions {
+ width: 100%;
+
+ > * {
+ flex: 1;
+ }
+ }
+
+ .dx-tab-toolbar-right {
+ margin-left: 0;
+ }
+
+ .dx-inspector-drawer {
+ width: 100%;
+ }
+}