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): enforce server quotas and add nav permissions UI
Juan Deniscbf64dfbaac1
diff --git a/backend/app/api/servers.py b/backend/app/api/servers.pyindex efb907bd..8e10d3dd 100644--- a/backend/app/api/servers.py+++ b/backend/app/api/servers.py@@ -332,6 +332,12 @@ def create_server():if ws_id is None:ws_id = WorkspaceService.ensure_default_workspace().id+ # Enforce workspace server quota.+ server_count = Server.query.filter_by(workspace_id=ws_id).count()+ quota_error = WorkspaceService.check_quota(ws_id, server_count, 'max_servers')+ if quota_error:+ return jsonify({'error': quota_error}), 403+server = Server(# Temporary name — replaced with the agent's hostname when the# agent calls /register. _is_placeholder_name() in the register@@ -400,6 +406,12 @@ def set_server_workspace(server_id):# Role reconciliation (#33): a 'viewer' member can't move resources into it.if not WorkspaceService.can_write_in_workspace(user, ws.id):return jsonify({'error': 'You have read-only access to the target workspace'}), 403+ # Enforce workspace server quota when moving a server into a workspace.+ if server.workspace_id != ws.id:+ server_count = Server.query.filter_by(workspace_id=ws.id).count()+ quota_error = WorkspaceService.check_quota(ws.id, server_count, 'max_servers')+ if quota_error:+ return jsonify({'error': quota_error}), 403ws_id = ws.idserver.workspace_id = ws_iddiff --git a/backend/app/api/workspaces.py b/backend/app/api/workspaces.pyindex 3072b2b1..88d42ef8 100644--- a/backend/app/api/workspaces.py+++ b/backend/app/api/workspaces.py@@ -66,7 +66,10 @@ def get_workspace(workspace_id):ws = WorkspaceService.get_workspace(workspace_id)if not ws:return jsonify({'error': 'Workspace not found'}), 404- return jsonify(ws.to_dict())+ d = ws.to_dict()+ d['my_role'] = WorkspaceService.get_user_role(ws.id, user.id)+ d['my_effective_role'] = WorkspaceService.effective_role(user, ws.id)+ return jsonify(d)@workspaces_bp.route('/', methods=['POST'])diff --git a/frontend/src/pages/WorkspaceDetail.jsx b/frontend/src/pages/WorkspaceDetail.jsxindex 08ac8767..937a507d 100644--- a/frontend/src/pages/WorkspaceDetail.jsx+++ b/frontend/src/pages/WorkspaceDetail.jsx@@ -10,6 +10,8 @@ import { Pill, ServiceTile, SegControl } from '@/components/ds';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';+import { Checkbox } from '@/components/ui/checkbox';+import { SIDEBAR_ITEMS } from '../components/sidebarItems';import {LayoutGrid, ChevronLeft, ChevronRight, Check, Server, Box, Globe,Users, Settings2, Plus, Archive, ArchiveRestore, Trash2,@@ -85,6 +87,7 @@ const WorkspaceDetail = () => {const setActiveWorkspace = () => {localStorage.setItem(ACTIVE_KEY, String(wsId));+ localStorage.setItem('active_workspace', JSON.stringify(ws));if (ws?.primary_color) localStorage.setItem(ACCENT_KEY, ws.primary_color);else localStorage.removeItem(ACCENT_KEY);window.location.reload();@@ -121,13 +124,22 @@ const WorkspaceDetail = () => {max_servers: ws.max_servers || 0,max_users: ws.max_users || 0,primary_color: ws.primary_color || '#6d7cff',+ nav: ws.settings?.nav || { owner: [], admin: [], member: [], viewer: [] },});setShowEdit(true);};const handleSave = async () => {try {- await api.updateWorkspace(wsId, form);+ const payload = {+ name: form.name,+ description: form.description,+ max_servers: form.max_servers,+ max_users: form.max_users,+ primary_color: form.primary_color,+ settings: { nav: form.nav },+ };+ await api.updateWorkspace(wsId, payload);toast.success('Workspace updated');setShowEdit(false);load();@@ -482,6 +494,34 @@ const WorkspaceDetail = () => {/><span className="form-hint">Recolors the panel for anyone viewing this workspace.</span></div>+ <div className="form-group">+ <label>Navigation Permissions</label>+ <span className="form-hint">Limit which sidebar items each workspace role can see. Empty = no restrictions.</span>+ {['owner', 'admin', 'member', 'viewer'].map(role => (+ <div key={role} className="ws-nav-role">+ <div className="ws-nav-role__label">{role}</div>+ <div className="ws-nav-role__items">+ {SIDEBAR_ITEMS.filter(item => !item.alwaysVisible).map(item => {+ const checked = (form.nav[role] || []).includes(item.id);+ return (+ <label key={`${role}-${item.id}`} className="ws-nav-role__item">+ <Checkbox+ checked={checked}+ onCheckedChange={(val) => {+ const list = new Set(form.nav[role] || []);+ if (val) list.add(item.id);+ else list.delete(item.id);+ setForm({ ...form, nav: { ...form.nav, [role]: Array.from(list) } });+ }}+ />+ <span>{item.label}</span>+ </label>+ );+ })}+ </div>+ </div>+ ))}+ </div></div><div className="modal-footer"><Button variant="outline" onClick={() => setShowEdit(false)}>Cancel</Button>diff --git a/frontend/src/styles/pages/_workspaces.scss b/frontend/src/styles/pages/_workspaces.scssindex 952f7080..c94681c9 100644--- a/frontend/src/styles/pages/_workspaces.scss+++ b/frontend/src/styles/pages/_workspaces.scss@@ -457,3 +457,36 @@gap: $space-2;flex-shrink: 0;}++// Navigation permission checkboxes in the workspace settings modal.+.ws-nav-role {+ margin-top: $space-3;++ &__label {+ font-size: 12px;+ font-weight: $font-weight-semibold;+ text-transform: uppercase;+ letter-spacing: 0.05em;+ color: var(--text-faint);+ margin-bottom: $space-2;+ }++ &__items {+ display: grid;+ grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));+ gap: $space-2;+ }++ &__item {+ display: flex;+ align-items: center;+ gap: $space-2;+ font-size: 12.5px;+ color: var(--text);+ cursor: pointer;++ .ui-checkbox {+ flex-shrink: 0;+ }+ }+}