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.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(workspaces): improve workspace switching and secrets/webhooks UI
Juan Denis45f754abc0af
diff --git a/backend/app/api/secrets_webhooks.py b/backend/app/api/secrets_webhooks.pyindex 56e3874d..1c6c0960 100644--- a/backend/app/api/secrets_webhooks.py+++ b/backend/app/api/secrets_webhooks.py@@ -7,6 +7,7 @@ from flask_jwt_extended import get_jwt_identity, jwt_requiredfrom app.services.secret_vault_service import SecretService, SecretVaultServicefrom app.services.webhook_gateway_service import WebhookGatewayService+from app.models import Workspacebp = Blueprint('secrets_webhooks', __name__)@@ -16,6 +17,11 @@ def _current_user_id() -> int:return int(identity) if identity else None+def _resolve_ws_value():+ """Return the raw workspace context from header or query string."""+ return request.headers.get('X-Workspace-Id') or request.args.get('workspace_id')++def _resolve_ws():"""Resolve the active workspace context (X-Workspace-Id header or?workspace_id) to a workspace id, or None for an unscoped view — mirrors the@@ -24,8 +30,7 @@ def _resolve_ws():from app.models import Userfrom app.services.workspace_service import WorkspaceServiceuser = User.query.get(get_jwt_identity())- return WorkspaceService.resolve_workspace_id(- user, request.headers.get('X-Workspace-Id') or request.args.get('workspace_id'))+ return WorkspaceService.resolve_workspace_id(user, _resolve_ws_value())def _json_or_form() -> dict:@@ -60,8 +65,24 @@ def create_vault():name = data.get('name')if not name:return {'error': 'name is required'}, 400+ user = User.query.get(get_jwt_identity())+ # Explicit workspace_id in the body takes precedence over the active context,+ # but the caller must be a member of that workspace.+ explicit_ws = data.get('workspace_id')+ if explicit_ws is not None:+ try:+ explicit_ws = int(explicit_ws)+ except (ValueError, TypeError):+ return {'error': 'workspace_id must be an integer'}, 400+ if Workspace.query.get(explicit_ws) is None:+ return {'error': 'Workspace not found'}, 404+ if not user.is_admin and WorkspaceService.get_user_role(explicit_ws, user.id) is None:+ return {'error': 'Workspace access denied'}, 403+ workspace_id = explicit_ws+ else:+ workspace_id = WorkspaceService.resolve_workspace_id(user, _resolve_ws_value())result = SecretVaultService.create_vault(name, description=data.get('description'),- user_id=_current_user_id(), workspace_id=_resolve_ws())+ user_id=user.id, workspace_id=workspace_id)if not result.get('success'):return {'error': result.get('error')}, 409return result, 201diff --git a/backend/app/api/workspaces.py b/backend/app/api/workspaces.pyindex c9185876..3072b2b1 100644--- a/backend/app/api/workspaces.py+++ b/backend/app/api/workspaces.py@@ -23,6 +23,17 @@ def require_workspace_access(workspace_id, user):return None+def require_workspace_role(workspace_id, user, roles):+ """Return 403 response tuple if user is not an admin and their workspace+ membership role is not one of the allowed roles."""+ if user.is_admin:+ return None+ role = WorkspaceService.get_user_role(workspace_id, user.id)+ if role not in roles:+ return jsonify({'error': 'Insufficient permissions'}), 403+ return None++@workspaces_bp.route('/', methods=['GET'])@jwt_required()def list_workspaces():@@ -165,6 +176,13 @@ def add_member(workspace_id):@workspaces_bp.route('/members/<int:member_id>/role', methods=['PUT'])@jwt_required()def update_member_role(member_id):+ user = get_current_user()+ member = WorkspaceService.get_member(member_id)+ if not member:+ return jsonify({'error': 'Member not found'}), 404+ denied = require_workspace_role(member.workspace_id, user, ['owner', 'admin'])+ if denied:+ return denieddata = request.get_json() or {}role = data.get('role')if not role:@@ -178,6 +196,13 @@ def update_member_role(member_id):@workspaces_bp.route('/members/<int:member_id>', methods=['DELETE'])@jwt_required()def remove_member(member_id):+ user = get_current_user()+ member = WorkspaceService.get_member(member_id)+ if not member:+ return jsonify({'error': 'Member not found'}), 404+ denied = require_workspace_role(member.workspace_id, user, ['owner', 'admin'])+ if denied:+ return deniedtry:result = WorkspaceService.remove_member(member_id)if not result:@@ -204,7 +229,7 @@ def list_api_keys(workspace_id):@jwt_required()def create_api_key(workspace_id):user = get_current_user()- denied = require_workspace_access(workspace_id, user)+ denied = require_workspace_role(workspace_id, user, ['owner', 'admin'])if denied:return denieddata = request.get_json() or {}@@ -215,6 +240,11 @@ def create_api_key(workspace_id):api_key, raw_key = WorkspaceService.create_api_key(workspace_id, name, scopes=data.get('scopes'), user_id=user.id)+ AuditService.log(+ action=AuditLog.ACTION_RESOURCE_CREATE, user_id=user.id,+ target_type='workspace_api_key', target_id=api_key.id,+ details={'workspace_id': workspace_id, 'name': name}+ )result = api_key.to_dict()result['key'] = raw_key # Only returned oncereturn jsonify(result), 201@@ -223,7 +253,19 @@ def create_api_key(workspace_id):@workspaces_bp.route('/api-keys/<int:key_id>/revoke', methods=['POST'])@jwt_required()def revoke_api_key(key_id):+ user = get_current_user()+ api_key = WorkspaceService.get_api_key(key_id)+ if not api_key:+ return jsonify({'error': 'API key not found'}), 404+ denied = require_workspace_role(api_key.workspace_id, user, ['owner', 'admin'])+ if denied:+ return deniedresult = WorkspaceService.revoke_api_key(key_id)if not result:return jsonify({'error': 'API key not found'}), 404+ AuditService.log(+ action=AuditLog.ACTION_RESOURCE_DELETE, user_id=user.id,+ target_type='workspace_api_key', target_id=key_id,+ details={'workspace_id': api_key.workspace_id}+ )return jsonify({'message': 'API key revoked'})diff --git a/backend/app/services/workspace_service.py b/backend/app/services/workspace_service.pyindex 61ce8201..40179113 100644--- a/backend/app/services/workspace_service.py+++ b/backend/app/services/workspace_service.py@@ -132,6 +132,19 @@ class WorkspaceService:read-only access to it (workspace role caps capability, narrow-only)."""return WorkspaceService.effective_role(user, workspace_id) != User.ROLE_VIEWER+ @staticmethod+ def check_quota(workspace_id, current_count, quota_field):+ """Return an error string if a workspace quota would be exceeded,+ otherwise None. `quota_field` is the Workspace column name."""+ ws = Workspace.query.get(workspace_id)+ if not ws:+ return 'Workspace not found'+ quota = getattr(ws, quota_field, 0) or 0+ if quota > 0 and current_count >= quota:+ label = quota_field.replace('max_', '').replace('_', ' ')+ return f'Workspace {label} limit reached (max {quota})'+ return None+@staticmethoddef list_workspaces(user_id=None, include_archived=False):query = Workspace.query@@ -234,6 +247,10 @@ class WorkspaceService:# --- Members ---+ @staticmethod+ def get_member(member_id):+ return WorkspaceMember.query.get(member_id)+@staticmethoddef get_members(workspace_id):return WorkspaceMember.query.filter_by(workspace_id=workspace_id).all()@@ -315,6 +332,10 @@ class WorkspaceService:db.session.commit()return api_key, raw_key+ @staticmethod+ def get_api_key(key_id):+ return WorkspaceApiKey.query.get(key_id)+@staticmethoddef list_api_keys(workspace_id):return WorkspaceApiKey.query.filter_by(workspace_id=workspace_id).all()diff --git a/frontend/src/components/Sidebar.jsx b/frontend/src/components/Sidebar.jsxindex a416f565..fdd471b1 100644--- a/frontend/src/components/Sidebar.jsx+++ b/frontend/src/components/Sidebar.jsx@@ -6,7 +6,7 @@ import { useLayout } from '../contexts/LayoutContext';import { Star, Settings, LogOut, Sun, Moon, Monitor, ChevronRight, ChevronDown, ChevronUp, Layers, Palette, PanelLeft, PanelLeftClose, PanelTop, Check, X, Server } from 'lucide-react';import { api } from '../services/api';import WorkspaceSwitcher from './WorkspaceSwitcher';-import { SIDEBAR_CATEGORIES, CATEGORY_LABELS, SIDEBAR_PRESETS, getHiddenItemIds, getVisibleItems } from './sidebarItems';+import { SIDEBAR_CATEGORIES, CATEGORY_LABELS, SIDEBAR_PRESETS, getHiddenItemIds, getVisibleItems, applyWorkspaceNavPermissions } from './sidebarItems';import { useContributions } from '../plugins/contributions';const Sidebar = ({ mobileOpen = false, isMobile = false, onMobileClose = () => {} }) => {@@ -150,10 +150,16 @@ const Sidebar = ({ mobileOpen = false, isMobile = false, onMobileClose = () => {// Top-level items can gate on a runtime condition (e.g. GPU Monitor// only when a GPU is present), mirroring sub-item requiresCondition.const conds = { wpInstalled, gpuAvailable };- return [...core, ...fromPlugins].filter(+ const items = [...core, ...fromPlugins].filter((item) => !item.requiresCondition || conds[item.requiresCondition]);- }, [user?.sidebar_config, pluginNav, wpInstalled, gpuAvailable]);+ // Apply workspace-level nav permissions if an active workspace is set+ // and it defines a nav map. This lets a workspace restrict which sidebar+ // items its members see based on their effective workspace role.+ const activeWorkspaceRaw = localStorage.getItem('active_workspace');+ const activeWorkspace = activeWorkspaceRaw ? JSON.parse(activeWorkspaceRaw) : null;+ return applyWorkspaceNavPermissions(items, activeWorkspace, user);+ }, [user?.sidebar_config, pluginNav, wpInstalled, gpuAvailable, user]);// Group visible items by categoryconst groupedItems = useMemo(() => {diff --git a/frontend/src/components/WorkspaceSwitcher.jsx b/frontend/src/components/WorkspaceSwitcher.jsxindex d34c2aea..4d34e81d 100644--- a/frontend/src/components/WorkspaceSwitcher.jsx+++ b/frontend/src/components/WorkspaceSwitcher.jsx@@ -3,6 +3,7 @@ import { Building2 } from 'lucide-react';import { api } from '../services/api';const ACTIVE_KEY = 'active_workspace_id';+const ACTIVE_WS_KEY = 'active_workspace'; // full workspace object for nav/brand settingsconst ACCENT_KEY = 'workspace_accent'; // ThemeContext applies this with precedence over the user accent// Mirror a workspace's brand color into localStorage so ThemeContext can apply it@@ -15,11 +16,20 @@ function syncAccent(ws) {}}+function syncWorkspace(ws) {+ if (ws) {+ localStorage.setItem(ACTIVE_WS_KEY, JSON.stringify(ws));+ } else {+ localStorage.removeItem(ACTIVE_WS_KEY);+ }+ syncAccent(ws);+}+// Active-workspace selector (#33). Self-contained: it reads/writes the active// workspace in localStorage (which services/api/client.js sends ambiently as the// X-Workspace-Id header) and reloads so every page re-fetches its lists under the-// new scope. Hidden unless the user belongs to more than one workspace, so-// single-tenant installs stay uncluttered.+// new scope. Always rendered when at least one workspace exists so the scoping+// concept stays visible even on single-workspace installs.const WorkspaceSwitcher = () => {const [workspaces, setWorkspaces] = useState([]);const [active, setActive] = useState(() => localStorage.getItem(ACTIVE_KEY) || 'all');@@ -38,11 +48,12 @@ const WorkspaceSwitcher = () => {// Stale selection (workspace deleted / access lost): clear it so// a dead X-Workspace-Id header / brand color isn't applied.localStorage.removeItem(ACTIVE_KEY);+ localStorage.removeItem(ACTIVE_WS_KEY);localStorage.removeItem(ACCENT_KEY);setActive('all');} else {- // Keep the brand color fresh for the next load if the admin changed it.- syncAccent(ws);+ // Keep workspace settings (brand color, nav permissions) fresh.+ syncWorkspace(ws);}}})@@ -50,16 +61,18 @@ const WorkspaceSwitcher = () => {return () => { alive = false; };}, []);- if (workspaces.length < 2) return null;+ if (workspaces.length === 0) return null;const handleChange = (e) => {const value = e.target.value;if (value === 'all') {localStorage.removeItem(ACTIVE_KEY);+ localStorage.removeItem(ACTIVE_WS_KEY);localStorage.removeItem(ACCENT_KEY);} else {+ const ws = workspaces.find((w) => String(w.id) === value);localStorage.setItem(ACTIVE_KEY, value);- syncAccent(workspaces.find((w) => String(w.id) === value));+ syncWorkspace(ws);}// Reload so every page re-fetches its lists (and re-applies the brand color)// under the new workspace scope.diff --git a/frontend/src/components/sidebarItems.js b/frontend/src/components/sidebarItems.jsindex aa3f1d27..b0d1a7f7 100644--- a/frontend/src/components/sidebarItems.js+++ b/frontend/src/components/sidebarItems.js@@ -32,6 +32,13 @@ export const SIDEBAR_ITEMS = [end: true,icon: '<rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/>'},+ {+ id: 'workspaces',+ label: 'Workspaces',+ route: '/workspaces',+ category: 'infrastructure',+ icon: '<path d="M3 3h7v7H3zM14 3h7v7h-7zM14 14h7v7h-7zM3 14h7v7H3z"/>'+ },{// Redesign: Servers uses the top-bar layout (REDESIGN_MAP §6 decision 3).// Its Agent Fleet / Fleet Monitor / Cloud Servers / Config Templates@@ -165,13 +172,6 @@ export const SIDEBAR_ITEMS = [category: 'operations',icon: '<rect x="3" y="3" width="7" height="7" rx="1"/><rect x="14" y="3" width="7" height="7" rx="1"/><rect x="14" y="14" width="7" height="7" rx="1"/><rect x="3" y="14" width="7" height="7" rx="1"/>'},- {- id: 'workspaces',- label: 'Workspaces',- route: '/workspaces',- category: 'system',- icon: '<path d="M3 3h7v7H3zM14 3h7v7h-7zM14 14h7v7h-7zM3 14h7v7H3z"/>'- },{id: 'terminal',label: 'Terminal / Logs',@@ -231,12 +231,12 @@ export const SIDEBAR_PRESETS = {web: {label: 'Web Hosting',description: 'Domains, SSL, databases, and web essentials',- hiddenItems: ['docker', 'git', 'workflow', 'email', 'workspaces', ...ADVANCED_ITEM_IDS]+ hiddenItems: ['docker', 'git', 'workflow', 'email', ...ADVANCED_ITEM_IDS]},email: {label: 'Email Admin',description: 'Email server, security, DNS, and monitoring',- hiddenItems: ['services', 'wordpress', 'workflow', 'databases', 'docker', 'git', 'cron', 'workspaces', ...ADVANCED_ITEM_IDS]+ hiddenItems: ['services', 'wordpress', 'workflow', 'databases', 'docker', 'git', 'cron', ...ADVANCED_ITEM_IDS]},devops: {label: 'Docker / DevOps',@@ -246,7 +246,7 @@ export const SIDEBAR_PRESETS = {minimal: {label: 'Minimal',description: 'Just the essentials — dashboard, servers, terminal',- hiddenItems: ['wordpress', 'workflow', 'databases', 'docker', 'git', 'email', 'cron', 'workspaces', ...ADVANCED_ITEM_IDS]+ hiddenItems: ['wordpress', 'workflow', 'databases', 'docker', 'git', 'email', 'cron', ...ADVANCED_ITEM_IDS]}};@@ -281,3 +281,21 @@ export function getVisibleItems(sidebarConfig) {item.alwaysVisible || !hidden.has(item.id));}++/**+ * Apply workspace-level nav permissions. A workspace can define+ * `settings.nav = { admin: ['servers', 'domains', ...], member: ['domains'], ... }`+ * to restrict which sidebar items are visible per effective workspace role.+ * Items marked `alwaysVisible` (e.g. Dashboard) are never hidden.+ */+export function applyWorkspaceNavPermissions(items, workspace, user) {+ if (!workspace?.settings?.nav) return items;+ // Super-admins bypass workspace nav restrictions so they can manage the+ // workspace itself without getting locked out.+ if (user?.is_admin) return items;+ const role = workspace.my_effective_role || workspace.my_role || 'member';+ const allowedIds = workspace.settings.nav[role];+ if (!Array.isArray(allowedIds) || allowedIds.length === 0) return items;+ const allowed = new Set(allowedIds);+ return items.filter(item => item.alwaysVisible || allowed.has(item.id));+}diff --git a/frontend/src/pages/SecretsWebhooks.jsx b/frontend/src/pages/SecretsWebhooks.jsxindex 0074cc68..b6d1284e 100644--- a/frontend/src/pages/SecretsWebhooks.jsx+++ b/frontend/src/pages/SecretsWebhooks.jsx@@ -9,6 +9,7 @@ import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';import { Textarea } from '@/components/ui/textarea';import { Badge } from '@/components/ui/badge';+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter } from '@/components/ui/dialog';import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu';@@ -28,10 +29,12 @@ export default function SecretsWebhooks() {const [vaults, setVaults] = useState([]);const [endpoints, setEndpoints] = useState([]);+ const [workspaces, setWorkspaces] = useState([]);const [loading, setLoading] = useState(true);// Vault modals- const [vaultForm, setVaultForm] = useState({ open: false, name: '', description: '' });+ const activeWorkspaceId = localStorage.getItem('active_workspace_id') || '';+ const [vaultForm, setVaultForm] = useState({ open: false, name: '', description: '', workspace_id: activeWorkspaceId });const [selectedVault, setSelectedVault] = useState(null);const [secretForm, setSecretForm] = useState({ open: false, name: '', value: '', description: '' });const [revealSecretId, setRevealSecretId] = useState(null);@@ -50,9 +53,14 @@ export default function SecretsWebhooks() {async function loadAll() {setLoading(true);try {- const [v, e] = await Promise.all([api.listVaults(), api.listWebhookEndpoints()]);+ const [v, e, w] = await Promise.all([+ api.listVaults(),+ api.listWebhookEndpoints(),+ api.getWorkspaces().catch(() => ({ workspaces: [] })),+ ]);setVaults(v.vaults || []);setEndpoints(e.endpoints || []);+ setWorkspaces(w.workspaces || []);} catch (err) {toast.error(`Load failed: ${err.message}`);} finally {@@ -63,8 +71,13 @@ export default function SecretsWebhooks() {async function createVault(e) {e.preventDefault();try {- await api.createVault({ name: vaultForm.name, description: vaultForm.description });- setVaultForm({ open: false, name: '', description: '' });+ const payload = {+ name: vaultForm.name,+ description: vaultForm.description,+ workspace_id: vaultForm.workspace_id || undefined,+ };+ await api.createVault(payload);+ setVaultForm({ open: false, name: '', description: '', workspace_id: activeWorkspaceId });loadAll();toast.success('Vault created');} catch (err) {@@ -226,7 +239,7 @@ export default function SecretsWebhooks() {<CardTitle>Secret Vaults</CardTitle><CardDescription>Encrypted key/value stores for credentials and tokens.</CardDescription></div>- <Button onClick={() => setVaultForm({ open: true, name: '', description: '' })}>+ <Button onClick={() => setVaultForm({ open: true, name: '', description: '', workspace_id: activeWorkspaceId })}><Plus size={14} /> New Vault</Button></div>@@ -453,6 +466,25 @@ export default function SecretsWebhooks() {<Label htmlFor="vaultDesc">Description</Label><Textarea id="vaultDesc" value={vaultForm.description} onChange={(e) => setVaultForm({ ...vaultForm, description: e.target.value })} /></div>+ {workspaces.length > 0 && (+ <div>+ <Label htmlFor="vaultWorkspace">Workspace</Label>+ <Select+ value={vaultForm.workspace_id || 'all'}+ onValueChange={(value) => setVaultForm({ ...vaultForm, workspace_id: value === 'all' ? '' : value })}+ >+ <SelectTrigger id="vaultWorkspace">+ <SelectValue placeholder="Select workspace" />+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="all">All workspaces</SelectItem>+ {workspaces.map((w) => (+ <SelectItem key={w.id} value={String(w.id)}>{w.name}</SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ )}<DialogFooter><Button type="submit">Create Vault</Button></DialogFooter>diff --git a/frontend/src/services/api/client.js b/frontend/src/services/api/client.jsindex 9df91824..b79064d3 100644--- a/frontend/src/services/api/client.js+++ b/frontend/src/services/api/client.js@@ -32,6 +32,7 @@ class ApiClient {localStorage.removeItem('access_token');localStorage.removeItem('refresh_token');localStorage.removeItem('active_workspace_id'); // drop workspace context on logout+ localStorage.removeItem('active_workspace');localStorage.removeItem('workspace_accent');}