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.

Workspace and queue bus improvements

Juan Denisbb0bd7ba1d51
diff --git a/backend/app/api/queue_bus.py b/backend/app/api/queue_bus.py
index 545edd60..5a2d9024 100644
--- a/backend/app/api/queue_bus.py
+++ b/backend/app/api/queue_bus.py
@@ -22,6 +22,18 @@ def _is_admin(user):
return user is not None and getattr(user, 'role', None) == 'admin'
+def _ensure_group_mutable(group_slug):
+ """Reject HTTP mutations against system-owned queue groups.
+
+ System groups (jobs, notifications, webhook deliveries, ...) are managed by
+ the panel itself and are read-only over the REST API. Internal producers and
+ consumers call ``QueueBusService`` directly and are unaffected by this guard.
+ """
+ group = QueueBusService.get_group(group_slug)
+ if group and group.get('owner_type') == 'system':
+ raise QueueBusError('System queue groups are read-only', 403)
+
+
def _handle_error(e):
if isinstance(e, QueueBusError):
return jsonify({'error': e.message}), e.status_code
@@ -101,6 +113,7 @@ def get_group(group_slug):
@jwt_required()
def update_group(group_slug):
try:
+ _ensure_group_mutable(group_slug)
data = request.get_json() or {}
group = QueueBusService.update_group(
slug=group_slug,
@@ -117,6 +130,7 @@ def update_group(group_slug):
@jwt_required()
def delete_group(group_slug):
try:
+ _ensure_group_mutable(group_slug)
result = QueueBusService.delete_group(group_slug)
return jsonify(result), 200
except Exception as e:
@@ -143,6 +157,7 @@ def list_queues(group_slug):
@jwt_required()
def create_queue(group_slug):
try:
+ _ensure_group_mutable(group_slug)
data = request.get_json() or {}
slug = data.get('slug')
name = data.get('name')
@@ -180,6 +195,7 @@ def get_queue(group_slug, queue_slug):
@jwt_required()
def update_queue(group_slug, queue_slug):
try:
+ _ensure_group_mutable(group_slug)
data = request.get_json() or {}
queue = QueueBusService.update_queue(
group_slug=group_slug,
@@ -197,6 +213,7 @@ def update_queue(group_slug, queue_slug):
@jwt_required()
def delete_queue(group_slug, queue_slug):
try:
+ _ensure_group_mutable(group_slug)
result = QueueBusService.delete_queue(group_slug, queue_slug)
return jsonify(result), 200
except Exception as e:
@@ -230,6 +247,7 @@ def list_messages(group_slug, queue_slug):
@jwt_required()
def send_message(group_slug, queue_slug):
try:
+ _ensure_group_mutable(group_slug)
data = request.get_json() or {}
payload = data.get('payload')
priority = data.get('priority', 0)
@@ -314,6 +332,7 @@ def fail_message(group_slug, queue_slug, message_id):
@jwt_required()
def requeue_message(group_slug, queue_slug, message_id):
try:
+ _ensure_group_mutable(group_slug)
message = QueueBusService.requeue(group_slug, queue_slug, message_id)
return jsonify({'message': message}), 200
except Exception as e:
@@ -324,6 +343,7 @@ def requeue_message(group_slug, queue_slug, message_id):
@jwt_required()
def delete_message(group_slug, queue_slug, message_id):
try:
+ _ensure_group_mutable(group_slug)
result = QueueBusService.delete_message(group_slug, queue_slug, message_id)
return jsonify(result), 200
except Exception as e:
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index dafce05d..64899c00 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -24,6 +24,7 @@
"@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-tabs": "^1.1.13",
"@radix-ui/react-tooltip": "^1.2.8",
+ "@rollup/rollup-win32-x64-msvc": "^4.62.2",
"@tailwindcss/vite": "^4.2.4",
"@xterm/addon-fit": "^0.10.0",
"@xterm/addon-web-links": "^0.11.0",
@@ -57,7 +58,7 @@
"vite": "^5.4.1"
},
"optionalDependencies": {
- "@rollup/rollup-win32-x64-msvc": "^4.60.0"
+ "@rollup/rollup-win32-x64-msvc": "^4.62.2"
}
},
"node_modules/@babel/code-frame": {
@@ -2953,9 +2954,9 @@
]
},
"node_modules/@rollup/rollup-win32-x64-msvc": {
- "version": "4.60.0",
- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.0.tgz",
- "integrity": "sha512-PrsWNQ8BuE00O3Xsx3ALh2Df8fAj9+cvvX9AIA6o4KpATR98c9mud4XtDWVvsEuyia5U4tVSTKygawyJkjm60w==",
+ "version": "4.62.2",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+ "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
"cpu": [
"x64"
],
diff --git a/frontend/package.json b/frontend/package.json
index 9cfd7cc8..4038bf54 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -10,7 +10,7 @@
"preview": "vite preview"
},
"optionalDependencies": {
- "@rollup/rollup-win32-x64-msvc": "^4.60.0"
+ "@rollup/rollup-win32-x64-msvc": "^4.62.2"
},
"dependencies": {
"@radix-ui/react-accordion": "^1.2.12",
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 683a1e1b..da66959b 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -71,6 +71,7 @@ import Deployments from './pages/Deployments';
import GpuMonitor from './pages/GpuMonitor';
import DynamicDns from './pages/DynamicDns';
import QueueOperations from './pages/QueueOperations';
+import QueueDetail from './pages/QueueDetail';
import Notifications from './pages/Notifications';
import DeliveryLog from './pages/DeliveryLog';
import Telemetry from './pages/Telemetry';
@@ -114,6 +115,15 @@ const PAGE_TITLES = {
'/agent-plugins': 'Marketplace',
'/server-templates': 'Server Templates',
'/workspaces': 'Workspaces',
+ '/workspaces/:id': 'Workspace',
+ '/workspaces/:id/overview': 'Workspace Overview',
+ '/workspaces/:id/servers': 'Workspace Servers',
+ '/workspaces/:id/services': 'Workspace Services',
+ '/workspaces/:id/sites': 'Workspace Sites',
+ '/workspaces/:id/members': 'Workspace Members',
+ '/workspaces/:id/settings': 'Workspace Settings',
+ '/workspaces/:id/settings/general': 'Workspace Settings',
+ '/workspaces/:id/settings/navigation': 'Workspace Navigation Permissions',
'/dns': 'DNS Zones',
'/status-pages': 'Status Pages',
'/cloud': 'Cloud Provisioning',
@@ -142,18 +152,32 @@ function PageTitleUpdater() {
// Handle dynamic routes and tab sub-routes
if (!title) {
+ if (path.startsWith('/workspaces/')) {
+ const parts = path.split('/');
+ const tab = parts[3];
+ const section = parts[4];
+ if (tab === 'settings' && section) {
+ title = PAGE_TITLES[`/workspaces/:id/settings/${section}`] || 'Workspace Settings';
+ } else if (tab) {
+ title = PAGE_TITLES[`/workspaces/:id/${tab}`] || 'Workspace';
+ } else {
+ title = 'Workspace';
+ }
+ }
// Check if it's a base page with a tab suffix (e.g., /security/firewall)
- const basePath = '/' + path.split('/')[1];
- if (PAGE_TITLES[basePath]) {
- title = PAGE_TITLES[basePath];
- } else if (pluginTitles && pluginTitles[basePath]) {
- title = pluginTitles[basePath];
- } else if (path.startsWith('/services/')) title = 'Service Details';
- else if (path.startsWith('/apps/')) title = 'Application Details';
- else if (path.startsWith('/servers/')) title = 'Server Details';
- else if (path.startsWith('/wordpress/projects/')) title = 'WordPress Pipeline';
- else if (path.startsWith('/wordpress/')) title = 'WordPress Site';
- else title = 'ServerKit';
+ else {
+ const basePath = '/' + path.split('/')[1];
+ if (PAGE_TITLES[basePath]) {
+ title = PAGE_TITLES[basePath];
+ } else if (pluginTitles && pluginTitles[basePath]) {
+ title = pluginTitles[basePath];
+ } else if (path.startsWith('/services/')) title = 'Service Details';
+ else if (path.startsWith('/apps/')) title = 'Application Details';
+ else if (path.startsWith('/servers/')) title = 'Server Details';
+ else if (path.startsWith('/wordpress/projects/')) title = 'WordPress Pipeline';
+ else if (path.startsWith('/wordpress/')) title = 'WordPress Site';
+ else title = 'ServerKit';
+ }
}
document.title = title ? `${title} | ServerKit` : 'ServerKit';
@@ -326,6 +350,8 @@ function AppRoutes() {
<Route path="agent-plugins" element={<Navigate to="/marketplace" replace />} />
<Route path="workspaces" element={<Workspaces />} />
<Route path="workspaces/:id" element={<WorkspaceDetail />} />
+ <Route path="workspaces/:id/:tab" element={<WorkspaceDetail />} />
+ <Route path="workspaces/:id/:tab/:section" element={<WorkspaceDetail />} />
<Route element={<TabGroupLayout tabs={MARKET_TABS} />}>
<Route path="marketplace" element={<Marketplace />} />
<Route path="downloads" element={<Downloads />} />
@@ -366,6 +392,7 @@ function AppRoutes() {
<Route path="secrets" element={<SecretsWebhooks />} />
<Route path="secrets/:tab" element={<SecretsWebhooks />} />
<Route path="queue" element={<QueueOperations />} />
+ <Route path="queue/:groupSlug/:queueSlug" element={<QueueDetail />} />
<Route path="notifications" element={<Notifications />} />
<Route path="admin/notifications" element={<DeliveryLog />} />
<Route path="telemetry" element={<Telemetry />} />
diff --git a/frontend/src/components/WorkspaceSwitcher.jsx b/frontend/src/components/WorkspaceSwitcher.jsx
index 4d34e81d..06013757 100644
--- a/frontend/src/components/WorkspaceSwitcher.jsx
+++ b/frontend/src/components/WorkspaceSwitcher.jsx
@@ -1,6 +1,13 @@
import { useEffect, useState } from 'react';
import { Building2 } from 'lucide-react';
import { api } from '../services/api';
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from './ui/select';
const ACTIVE_KEY = 'active_workspace_id';
const ACTIVE_WS_KEY = 'active_workspace'; // full workspace object for nav/brand settings
@@ -63,8 +70,7 @@ const WorkspaceSwitcher = () => {
if (workspaces.length === 0) return null;
- const handleChange = (e) => {
- const value = e.target.value;
+ const handleChange = (value) => {
if (value === 'all') {
localStorage.removeItem(ACTIVE_KEY);
localStorage.removeItem(ACTIVE_WS_KEY);
@@ -80,20 +86,18 @@ const WorkspaceSwitcher = () => {
};
return (
- <div className="workspace-switcher">
- <Building2 size={14} className="workspace-switcher__icon" aria-hidden="true" />
- <select
- className="workspace-switcher__select"
- value={active}
- onChange={handleChange}
- aria-label="Active workspace"
- >
- <option value="all">All workspaces</option>
+ <Select value={active} onValueChange={handleChange}>
+ <SelectTrigger className="workspace-switcher__trigger" aria-label="Active workspace">
+ <Building2 size={14} className="workspace-switcher__icon" aria-hidden="true" />
+ <SelectValue placeholder="All workspaces" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="all">All workspaces</SelectItem>
{workspaces.map((w) => (
- <option key={w.id} value={String(w.id)}>{w.name}</option>
+ <SelectItem key={w.id} value={String(w.id)}>{w.name}</SelectItem>
))}
- </select>
- </div>
+ </SelectContent>
+ </Select>
);
};
diff --git a/frontend/src/components/workspaces/WorkspaceMembersTab.jsx b/frontend/src/components/workspaces/WorkspaceMembersTab.jsx
new file mode 100644
index 00000000..e7e0cbfd
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceMembersTab.jsx
@@ -0,0 +1,54 @@
+import { Users, Plus } from 'lucide-react';
+import { ServiceTile, Pill } from '@/components/ds';
+import { Button } from '@/components/ui/button';
+
+const WorkspaceMembersTab = ({ wsId, members, allUsers, onAddMember, onRemoveMember }) => (
+ <>
+ <div className="ws-detail__tablecard">
+ <table className="sk-dtable">
+ <thead><tr><th>Member</th><th>Role</th><th style={{ width: 120 }} /></tr></thead>
+ <tbody>
+ {members.map(m => (
+ <tr key={m.id}>
+ <td>
+ <div className="sk-cell-name">
+ <ServiceTile name={m.username || m.email || '?'} size={30} className="ws-row__av" />
+ <div>
+ <div>{m.username || m.email}</div>
+ {m.username && m.email && <div className="sk-cell-sub">{m.email}</div>}
+ </div>
+ </div>
+ </td>
+ <td>
+ {m.role === 'owner'
+ ? <Pill kind="green">{m.role}</Pill>
+ : <span className="sk-tag">{m.role}</span>}
+ </td>
+ <td>
+ {m.role !== 'owner' && (
+ <Button size="sm" variant="destructive" onClick={() => onRemoveMember(m.id)}>Remove</Button>
+ )}
+ </td>
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ {allUsers.filter(u => !members.find(m => m.user_id === u.id)).length > 0 && (
+ <>
+ <div className="ws-pick-label">Add a member</div>
+ <div className="ws-pick">
+ {allUsers.filter(u => !members.find(m => m.user_id === u.id)).map(u => (
+ <div key={u.id} className="ws-pick__item" onClick={() => onAddMember(u.id)}>
+ <ServiceTile name={u.username || u.email || '?'} size={24} className="ws-row__av" />
+ <span className="ws-pick__name">{u.username || u.email}</span>
+ <Plus size={14} className="ws-pick__plus" />
+ </div>
+ ))}
+ </div>
+ </>
+ )}
+ </>
+);
+
+export default WorkspaceMembersTab;
diff --git a/frontend/src/components/workspaces/WorkspaceOverviewTab.jsx b/frontend/src/components/workspaces/WorkspaceOverviewTab.jsx
new file mode 100644
index 00000000..ea3a4ed2
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceOverviewTab.jsx
@@ -0,0 +1,36 @@
+import { ServiceTile } from '@/components/ds';
+
+const WorkspaceOverviewTab = ({ ws, since, members, srvIn, services, sites }) => (
+ <div className="ws-detail__grid">
+ <section className="ws-detail__card">
+ <h3>Workspace</h3>
+ <div className="sk-info-row"><span className="k">Slug</span><span className="v">/{ws.slug}</span></div>
+ <div className="sk-info-row"><span className="k">Created</span><span className="v">{since || '—'}</span></div>
+ <div className="sk-info-row"><span className="k">Max servers</span><span className="v">{ws.max_servers > 0 ? ws.max_servers : 'Unlimited'}</span></div>
+ <div className="sk-info-row"><span className="k">Max users</span><span className="v">{ws.max_users > 0 ? ws.max_users : 'Unlimited'}</span></div>
+ </section>
+ <section className="ws-detail__card">
+ <h3>Resources</h3>
+ <div className="ws-resource-stats">
+ <div className="ws-resource-stats__item">
+ <div className="ws-resource-stats__value">{srvIn.length}</div>
+ <div className="ws-resource-stats__label">Servers</div>
+ </div>
+ <div className="ws-resource-stats__item">
+ <div className="ws-resource-stats__value">{services.length}</div>
+ <div className="ws-resource-stats__label">Services</div>
+ </div>
+ <div className="ws-resource-stats__item">
+ <div className="ws-resource-stats__value">{sites.length}</div>
+ <div className="ws-resource-stats__label">Sites</div>
+ </div>
+ <div className="ws-resource-stats__item">
+ <div className="ws-resource-stats__value">{members.length}</div>
+ <div className="ws-resource-stats__label">Members</div>
+ </div>
+ </div>
+ </section>
+ </div>
+);
+
+export default WorkspaceOverviewTab;
diff --git a/frontend/src/components/workspaces/WorkspaceServersTab.jsx b/frontend/src/components/workspaces/WorkspaceServersTab.jsx
new file mode 100644
index 00000000..82d57e01
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceServersTab.jsx
@@ -0,0 +1,63 @@
+import { useNavigate } from 'react-router-dom';
+import { Server, Plus } from 'lucide-react';
+import { ServiceTile, Pill } from '@/components/ds';
+import { Button } from '@/components/ui/button';
+import EmptyState from '../EmptyState';
+
+const SERVER_PILL = { online: 'green', pending: 'amber', offline: 'red' };
+
+const WorkspaceServersTab = ({ wsId, srvIn, srvOut, onMoveServer }) => {
+ const navigate = useNavigate();
+
+ return (
+ <>
+ {srvIn.length === 0 ? (
+ <EmptyState icon={Server} title="No servers in this workspace yet" description="Move one in below." />
+ ) : (
+ <div className="ws-detail__tablecard">
+ <table className="sk-dtable">
+ <thead><tr><th>Server</th><th>Status</th><th style={{ width: 160 }} /></tr></thead>
+ <tbody>
+ {srvIn.map(s => (
+ <tr key={s.id} className="is-clickable" onClick={() => navigate(`/servers/${s.id}`)}>
+ <td>
+ <div className="sk-cell-name">
+ <ServiceTile name={s.name} size={30} />
+ <div>
+ <div>{s.name}</div>
+ <div className="sk-cell-sub">{s.ip_address || s.hostname || ''}</div>
+ </div>
+ </div>
+ </td>
+ <td><Pill kind={SERVER_PILL[s.status] || 'gray'}>{s.status || 'unknown'}</Pill></td>
+ <td onClick={e => e.stopPropagation()}>
+ <div className="ws-detail__rowactions">
+ <Button size="sm" variant="destructive" onClick={() => onMoveServer(s.id, null)}>Remove</Button>
+ </div>
+ </td>
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ )}
+ {srvOut.length > 0 && (
+ <>
+ <div className="ws-pick-label">Move a server into this workspace</div>
+ <div className="ws-pick">
+ {srvOut.map(s => (
+ <div key={s.id} className="ws-pick__item" onClick={() => onMoveServer(s.id, wsId)}>
+ <ServiceTile name={s.name} size={28} className="ws-pick__tile" />
+ <span className="ws-pick__name">{s.name}</span>
+ {s.ip_address && <span className="sk-tag">{s.ip_address}</span>}
+ <Plus size={16} className="ws-pick__plus" />
+ </div>
+ ))}
+ </div>
+ </>
+ )}
+ </>
+ );
+};
+
+export default WorkspaceServersTab;
diff --git a/frontend/src/components/workspaces/WorkspaceServicesTab.jsx b/frontend/src/components/workspaces/WorkspaceServicesTab.jsx
new file mode 100644
index 00000000..1907cdab
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceServicesTab.jsx
@@ -0,0 +1,64 @@
+import { useNavigate } from 'react-router-dom';
+import { Box, Plus } from 'lucide-react';
+import { ServiceTile, Pill } from '@/components/ds';
+import { Button } from '@/components/ui/button';
+import EmptyState from '../EmptyState';
+
+const APP_PILL = { running: 'green', stopped: 'gray', failed: 'red' };
+
+const WorkspaceServicesTab = ({ wsId, services, appsOut, onMoveApp, onShare }) => {
+ const navigate = useNavigate();
+
+ return (
+ <>
+ {services.length === 0 ? (
+ <EmptyState icon={Box} title="No services in this workspace yet" description="Move one in below." />
+ ) : (
+ <div className="ws-detail__tablecard">
+ <table className="sk-dtable">
+ <thead><tr><th>Service</th><th>Status</th><th style={{ width: 220 }} /></tr></thead>
+ <tbody>
+ {services.map(a => (
+ <tr key={a.id} className="is-clickable" onClick={() => navigate(`/services/${a.id}`)}>
+ <td>
+ <div className="sk-cell-name">
+ <ServiceTile name={a.name} size={30} />
+ <div>
+ <div>{a.name}</div>
+ <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
+ </div>
+ </div>
+ </td>
+ <td><Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill></td>
+ <td onClick={e => e.stopPropagation()}>
+ <div className="ws-detail__rowactions">
+ <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
+ <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
+ </div>
+ </td>
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ )}
+ {appsOut.length > 0 && (
+ <>
+ <div className="ws-pick-label">Move an application into this workspace</div>
+ <div className="ws-pick">
+ {appsOut.map(a => (
+ <div key={a.id} className="ws-pick__item" onClick={() => onMoveApp(a.id, wsId)}>
+ <ServiceTile name={a.name} size={28} className="ws-pick__tile" />
+ <span className="ws-pick__name">{a.name}</span>
+ <span className="sk-tag">{a.app_type}</span>
+ <Plus size={16} className="ws-pick__plus" />
+ </div>
+ ))}
+ </div>
+ </>
+ )}
+ </>
+ );
+};
+
+export default WorkspaceServicesTab;
diff --git a/frontend/src/components/workspaces/WorkspaceSettingsTab.jsx b/frontend/src/components/workspaces/WorkspaceSettingsTab.jsx
new file mode 100644
index 00000000..f175379f
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceSettingsTab.jsx
@@ -0,0 +1,247 @@
+import { useState, useEffect } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { Settings, PanelLeft, Check, Archive, ArchiveRestore, Trash2 } from 'lucide-react';
+import { useToast } from '../../contexts/ToastContext';
+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 '../sidebarItems';
+import api from '../../services/api';
+
+const SETTINGS_GROUPS = [
+ {
+ label: 'General',
+ items: [
+ { id: 'general', label: 'General', icon: Settings },
+ ],
+ },
+ {
+ label: 'Permissions',
+ items: [
+ { id: 'navigation', label: 'Navigation Permissions', icon: PanelLeft },
+ ],
+ },
+ {
+ label: 'Management',
+ items: [
+ { id: 'management', label: 'Workspace actions', icon: Archive },
+ ],
+ },
+];
+
+const SETTINGS_ITEMS = SETTINGS_GROUPS.flatMap((g) => g.items);
+
+const GeneralSection = ({ form, setForm }) => (
+ <div className="ws-settings__section">
+ <h3 className="ws-settings__section-title">General</h3>
+ <div className="card settings-section">
+ <div className="form-group">
+ <label>Name</label>
+ <Input
+ value={form.name}
+ onChange={(e) => setForm((f) => ({ ...f, name: e.target.value }))}
+ placeholder="My Team"
+ />
+ </div>
+ <div className="form-group">
+ <label>Description</label>
+ <Textarea
+ value={form.description}
+ onChange={(e) => setForm((f) => ({ ...f, description: e.target.value }))}
+ rows={2}
+ />
+ </div>
+ <div className="form-row">
+ <div className="form-group">
+ <label>Max Servers (0 = unlimited)</label>
+ <Input
+ type="number"
+ value={form.max_servers}
+ onChange={(e) => setForm((f) => ({ ...f, max_servers: parseInt(e.target.value) || 0 }))}
+ />
+ </div>
+ <div className="form-group">
+ <label>Max Users (0 = unlimited)</label>
+ <Input
+ type="number"
+ value={form.max_users}
+ onChange={(e) => setForm((f) => ({ ...f, max_users: parseInt(e.target.value) || 0 }))}
+ />
+ </div>
+ </div>
+ <div className="form-group">
+ <label>Brand Color</label>
+ <input
+ type="color"
+ className="workspace-color-input"
+ value={form.primary_color}
+ onChange={(e) => setForm((f) => ({ ...f, primary_color: e.target.value }))}
+ aria-label="Workspace brand color"
+ />
+ <span className="form-hint">Recolors the panel for anyone viewing this workspace.</span>
+ </div>
+ </div>
+ </div>
+);
+
+const ManagementSection = ({ ws, isCurrent, onSetActive, onArchive, onRestore, onDeleteClick, user }) => (
+ <div className="ws-settings__section">
+ <h3 className="ws-settings__section-title">Workspace management</h3>
+ <div className="card settings-section ws-settings__management">
+ <p className="form-hint">These actions take effect immediately and cannot be undone from this screen.</p>
+ <div className="ws-settings__actions-grid">
+ {!isCurrent && ws.status === 'active' && (
+ <Button variant="outline" onClick={onSetActive}>
+ <Check size={15} /> Set active workspace
+ </Button>
+ )}
+ {ws.status === 'active'
+ ? (
+ <Button variant="outline" onClick={onArchive}>
+ <Archive size={15} /> Archive workspace
+ </Button>
+ ) : (
+ <Button variant="outline" onClick={onRestore}>
+ <ArchiveRestore size={15} /> Restore workspace
+ </Button>
+ )}
+ {user?.is_admin && (
+ <Button variant="destructive" onClick={onDeleteClick}>
+ <Trash2 size={15} /> Delete workspace
+ </Button>
+ )}
+ </div>
+ </div>
+ </div>
+);
+
+const NavigationPermissionsSection = ({ form, setForm }) => {
+ const roles = ['owner', 'admin', 'member', 'viewer'];
+ return (
+ <div className="ws-settings__section">
+ <h3 className="ws-settings__section-title">Navigation Permissions</h3>
+ <div className="card settings-section">
+ <p className="form-hint">Limit which sidebar items each workspace role can see. Empty = no restrictions.</p>
+ {roles.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((f) => ({ ...f, nav: { ...f.nav, [role]: Array.from(list) } }));
+ }}
+ />
+ <span>{item.label}</span>
+ </label>
+ );
+ })}
+ </div>
+ </div>
+ ))}
+ </div>
+ </div>
+ );
+};
+
+const WorkspaceSettingsTab = ({ wsId, ws, onUpdate, user, isCurrent, onSetActive, onArchive, onRestore, onDeleteClick }) => {
+ const navigate = useNavigate();
+ const toast = useToast();
+ const { id, section: sectionParam } = useParams();
+ const section = SETTINGS_ITEMS.some((s) => s.id === sectionParam) ? sectionParam : 'general';
+ const setSection = (s) => navigate(`/workspaces/${id}/settings/${s}`, { replace: true });
+ const active = SETTINGS_ITEMS.find((s) => s.id === section) || SETTINGS_ITEMS[0];
+
+ useEffect(() => {
+ if (!sectionParam || !SETTINGS_ITEMS.some((s) => s.id === sectionParam)) {
+ navigate(`/workspaces/${id}/settings/general`, { replace: true });
+ }
+ }, [id, sectionParam, navigate]);
+
+ const [form, setForm] = useState({
+ name: ws.name,
+ description: ws.description || '',
+ 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: [] },
+ });
+ const [saving, setSaving] = useState(false);
+
+ const handleSave = async () => {
+ setSaving(true);
+ try {
+ 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');
+ onUpdate();
+ } catch (err) {
+ toast.error(err.message || 'Failed to update workspace');
+ } finally {
+ setSaving(false);
+ }
+ };
+
+ return (
+ <div className="ws-settings">
+ <nav className="ws-settings__nav" aria-label="Workspace settings sections">
+ {SETTINGS_GROUPS.map((g) => (
+ <div className="ws-settings__group" key={g.label}>
+ <div className="ws-settings__grouplabel">{g.label}</div>
+ {g.items.map((s) => (
+ <button
+ type="button"
+ key={s.id}
+ className={`ws-settings__navitem ${section === s.id ? 'is-active' : ''}`}
+ onClick={() => setSection(s.id)}
+ >
+ <s.icon size={15} />
+ {s.label}
+ </button>
+ ))}
+ </div>
+ ))}
+ </nav>
+ <div className="ws-settings__content">
+ {active.id === 'general' && <GeneralSection form={form} setForm={setForm} />}
+ {active.id === 'navigation' && <NavigationPermissionsSection form={form} setForm={setForm} />}
+ {active.id === 'management' && (
+ <ManagementSection
+ ws={ws}
+ isCurrent={isCurrent}
+ onSetActive={onSetActive}
+ onArchive={onArchive}
+ onRestore={onRestore}
+ onDeleteClick={onDeleteClick}
+ user={user}
+ />
+ )}
+ {active.id !== 'management' && (
+ <div className="ws-settings__actions">
+ <Button variant="outline" onClick={() => navigate(`/workspaces/${id}`)}>Cancel</Button>
+ <Button onClick={handleSave} disabled={saving || !form.name}>
+ {saving ? 'Saving…' : 'Save'}
+ </Button>
+ </div>
+ )}
+ </div>
+ </div>
+ );
+};
+
+export default WorkspaceSettingsTab;
diff --git a/frontend/src/components/workspaces/WorkspaceSitesTab.jsx b/frontend/src/components/workspaces/WorkspaceSitesTab.jsx
new file mode 100644
index 00000000..8b056560
--- /dev/null
+++ b/frontend/src/components/workspaces/WorkspaceSitesTab.jsx
@@ -0,0 +1,64 @@
+import { useNavigate } from 'react-router-dom';
+import { Globe, Plus } from 'lucide-react';
+import { ServiceTile, Pill } from '@/components/ds';
+import { Button } from '@/components/ui/button';
+import EmptyState from '../EmptyState';
+
+const APP_PILL = { running: 'green', stopped: 'gray', failed: 'red' };
+
+const WorkspaceSitesTab = ({ wsId, sites, appsOut, onMoveApp, onShare }) => {
+ const navigate = useNavigate();
+
+ return (
+ <>
+ {sites.length === 0 ? (
+ <EmptyState icon={Globe} title="No sites in this workspace yet" description="Move one in below." />
+ ) : (
+ <div className="ws-detail__tablecard">
+ <table className="sk-dtable">
+ <thead><tr><th>Site</th><th>Status</th><th style={{ width: 220 }} /></tr></thead>
+ <tbody>
+ {sites.map(a => (
+ <tr key={a.id} className="is-clickable" onClick={() => navigate(`/services/${a.id}`)}>
+ <td>
+ <div className="sk-cell-name">
+ <ServiceTile name={a.name} size={30} />
+ <div>
+ <div>{a.name}</div>
+ <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
+ </div>
+ </div>
+ </td>
+ <td><Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill></td>
+ <td onClick={e => e.stopPropagation()}>
+ <div className="ws-detail__rowactions">
+ <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
+ <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
+ </div>
+ </td>
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ )}
+ {appsOut.length > 0 && (
+ <>
+ <div className="ws-pick-label">Move a site into this workspace</div>
+ <div className="ws-pick">
+ {appsOut.map(a => (
+ <div key={a.id} className="ws-pick__item" onClick={() => onMoveApp(a.id, wsId)}>
+ <ServiceTile name={a.name} size={28} className="ws-pick__tile" />
+ <span className="ws-pick__name">{a.name}</span>
+ <span className="sk-tag">{a.app_type}</span>
+ <Plus size={16} className="ws-pick__plus" />
+ </div>
+ ))}
+ </div>
+ </>
+ )}
+ </>
+ );
+};
+
+export default WorkspaceSitesTab;
diff --git a/frontend/src/pages/QueueDetail.jsx b/frontend/src/pages/QueueDetail.jsx
new file mode 100644
index 00000000..76b987ee
--- /dev/null
+++ b/frontend/src/pages/QueueDetail.jsx
@@ -0,0 +1,365 @@
+import { useState, useEffect, useRef, useCallback } from 'react';
+import { useParams, useNavigate } from 'react-router-dom';
+import {
+ ArrowLeft,
+ Inbox,
+ Send,
+ Trash2,
+ RefreshCw,
+ Lock,
+ X,
+} from 'lucide-react';
+import api from '../services/api';
+import { useToast } from '../contexts/ToastContext';
+import { useConfirm } from '../hooks/useConfirm';
+import { ConfirmDialog } from '../components/ConfirmDialog';
+import EmptyState from '../components/EmptyState';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
+import { MetricCard, Pill } from '@/components/ds';
+
+const STATUS_KINDS = {
+ pending: 'blue',
+ in_flight: 'yellow',
+ completed: 'green',
+ failed: 'red',
+ dead_letter: 'gray',
+};
+
+const STATUS_LABELS = {
+ pending: 'Pending',
+ in_flight: 'In Flight',
+ completed: 'Completed',
+ failed: 'Failed',
+ dead_letter: 'Dead Letter',
+};
+
+const STATUS_ORDER = ['pending', 'in_flight', 'completed', 'failed', 'dead_letter'];
+
+const POLL_INTERVAL = 3000;
+
+const QueueDetail = () => {
+ const { groupSlug, queueSlug } = useParams();
+ const navigate = useNavigate();
+ const toast = useToast();
+ const { confirm, confirmState, handleConfirm, handleCancel } = useConfirm();
+
+ const [loading, setLoading] = useState(true);
+ const [queue, setQueue] = useState(null);
+ const [group, setGroup] = useState(null);
+ const [messages, setMessages] = useState([]);
+ const [statusFilter, setStatusFilter] = useState('all');
+ const [selectedMessage, setSelectedMessage] = useState(null);
+ const [showSend, setShowSend] = useState(false);
+ const [sendForm, setSendForm] = useState({ payload: '{}', priority: 0, delay_ms: 0 });
+
+ const pollRef = useRef(null);
+
+ const viewOnly = group?.owner_type === 'system';
+
+ const loadMeta = useCallback(async () => {
+ try {
+ const [queueRes, groupRes] = await Promise.all([
+ api.getQueue(groupSlug, queueSlug),
+ api.getQueueGroup(groupSlug).catch(() => null),
+ ]);
+ setQueue(queueRes.queue || null);
+ setGroup(groupRes?.group || null);
+ } catch (err) {
+ toast.error(err.message);
+ navigate('/queue');
+ } finally {
+ setLoading(false);
+ }
+ }, [groupSlug, queueSlug, navigate, toast]);
+
+ const loadMessages = useCallback(async (status) => {
+ try {
+ const res = await api.getMessages(groupSlug, queueSlug, {
+ status: status === 'all' ? undefined : status,
+ limit: 100,
+ });
+ setMessages(res.messages || []);
+ } catch (err) {
+ toast.error(err.message);
+ }
+ }, [groupSlug, queueSlug, toast]);
+
+ useEffect(() => {
+ loadMeta();
+ }, [loadMeta]);
+
+ useEffect(() => {
+ loadMessages(statusFilter);
+ pollRef.current = setInterval(() => {
+ loadMessages(statusFilter);
+ api.getQueue(groupSlug, queueSlug)
+ .then(r => setQueue(r.queue || null))
+ .catch(() => {});
+ }, POLL_INTERVAL);
+ return () => {
+ if (pollRef.current) clearInterval(pollRef.current);
+ };
+ }, [statusFilter, loadMessages, groupSlug, queueSlug]);
+
+ const stats = queue?.stats || {};
+
+ const handleSend = async (e) => {
+ e.preventDefault();
+ let payload = {};
+ try {
+ payload = JSON.parse(sendForm.payload);
+ } catch {
+ toast.error('Payload must be valid JSON');
+ return;
+ }
+ try {
+ await api.sendMessage(groupSlug, queueSlug, payload, {
+ priority: parseInt(sendForm.priority, 10) || 0,
+ delay_ms: parseInt(sendForm.delay_ms, 10) || 0,
+ });
+ toast.success('Message sent');
+ setShowSend(false);
+ setSendForm({ payload: '{}', priority: 0, delay_ms: 0 });
+ loadMessages(statusFilter);
+ } catch (err) {
+ toast.error(err.message);
+ }
+ };
+
+ const handleRequeue = async (msg) => {
+ try {
+ await api.requeueMessage(groupSlug, queueSlug, msg.id);
+ toast.success('Message requeued');
+ loadMessages(statusFilter);
+ } catch (err) {
+ toast.error(err.message);
+ }
+ };
+
+ const handleDelete = async (msg) => {
+ const confirmed = await confirm({
+ title: 'Delete Message',
+ message: 'Permanently delete this message?',
+ variant: 'danger',
+ });
+ if (!confirmed) return;
+ try {
+ await api.deleteMessage(groupSlug, queueSlug, msg.id);
+ toast.success('Message deleted');
+ if (selectedMessage?.id === msg.id) setSelectedMessage(null);
+ loadMessages(statusFilter);
+ } catch (err) {
+ toast.error(err.message);
+ }
+ };
+
+ if (loading) {
+ return (
+ <div className="queue-page queue-page--loading">
+ <div className="queue-loading-card">
+ <Inbox size={24} />
+ <span>Loading queue...</span>
+ </div>
+ </div>
+ );
+ }
+
+ return (
+ <div className="queue-page queue-detail">
+ <div className="queue-detail-header">
+ <button type="button" className="queue-back" onClick={() => navigate('/queue')}>
+ <ArrowLeft size={16} /> Queue Bus
+ </button>
+ <div className="queue-detail-headline">
+ <div className="queue-workbar-title">
+ <span>Queue</span>
+ <h1>{queue?.name || queueSlug}</h1>
+ <em>{groupSlug} / {queueSlug}</em>
+ </div>
+ <div className="queue-detail-actions">
+ {viewOnly && (
+ <span className="queue-readonly-badge">
+ <Lock size={12} /> Read-only
+ </span>
+ )}
+ {!viewOnly && (
+ <Button variant="outline" onClick={() => setShowSend(true)}>
+ <Send size={16} /> Send Message
+ </Button>
+ )}
+ <Button variant="outline" onClick={() => { loadMeta(); loadMessages(statusFilter); }}>
+ <RefreshCw size={16} /> Refresh
+ </Button>
+ </div>
+ </div>
+ </div>
+
+ <div className="queue-detail-stats">
+ <MetricCard label="Total" value={stats.total || 0} />
+ {STATUS_ORDER.map(s => (
+ <MetricCard
+ key={s}
+ label={STATUS_LABELS[s]}
+ value={stats[s] || 0}
+ kind={s === 'failed' || s === 'dead_letter' ? 'danger' : undefined}
+ />
+ ))}
+ </div>
+
+ <div className={`queue-detail-body ${selectedMessage ? 'has-panel' : ''}`}>
+ <div className="queue-detail-main">
+ <div className="queue-messages-toolbar">
+ <select
+ className="queue-select"
+ value={statusFilter}
+ onChange={(e) => setStatusFilter(e.target.value)}
+ >
+ <option value="all">All statuses</option>
+ {STATUS_ORDER.map(s => <option key={s} value={s}>{STATUS_LABELS[s]}</option>)}
+ </select>
+ <span className="queue-results-summary">
+ <strong>{messages.length}</strong>
+ <span>{messages.length === 1 ? 'message' : 'messages'}</span>
+ </span>
+ </div>
+
+ {messages.length === 0 ? (
+ <EmptyState
+ icon={Inbox}
+ title="No messages"
+ description={viewOnly
+ ? 'This system queue has no messages in this view.'
+ : 'This queue is empty. Send a message to get started.'}
+ />
+ ) : (
+ <div className="queue-table-wrap">
+ <table className="queue-table">
+ <thead>
+ <tr>
+ <th>Status</th>
+ <th>Payload</th>
+ <th>Attempts</th>
+ <th>Created</th>
+ {!viewOnly && <th className="col-actions" aria-label="Actions" />}
+ </tr>
+ </thead>
+ <tbody>
+ {messages.map(msg => (
+ <tr
+ key={msg.id}
+ className={`is-clickable ${selectedMessage?.id === msg.id ? 'is-selected' : ''}`}
+ onClick={() => setSelectedMessage(msg)}
+ >
+ <td><Pill kind={STATUS_KINDS[msg.status] || 'gray'}>{msg.status}</Pill></td>
+ <td><code className="queue-payload-preview">{JSON.stringify(msg.payload).slice(0, 80)}</code></td>
+ <td>{msg.attempts} / {msg.max_attempts}</td>
+ <td>{new Date(msg.created_at).toLocaleString()}</td>
+ {!viewOnly && (
+ <td className="col-actions" onClick={e => e.stopPropagation()}>
+ <div className="queue-actions">
+ {(msg.status === 'failed' || msg.status === 'dead_letter') && (
+ <Button variant="ghost" size="sm" onClick={() => handleRequeue(msg)} title="Requeue">
+ <RefreshCw size={14} />
+ </Button>
+ )}
+ <Button variant="ghost" size="sm" onClick={() => handleDelete(msg)} title="Delete message">
+ <Trash2 size={14} />
+ </Button>
+ </div>
+ </td>
+ )}
+ </tr>
+ ))}
+ </tbody>
+ </table>
+ </div>
+ )}
+ </div>
+
+ {selectedMessage && (
+ <aside className="queue-detail-panel">
+ <div className="queue-detail-panel-header">
+ <h2>Message</h2>
+ <button type="button" className="queue-panel-close" onClick={() => setSelectedMessage(null)} aria-label="Close">
+ <X size={16} />
+ </button>
+ </div>
+ <div className="queue-message-detail">
+ <div><strong>ID:</strong> <code>{selectedMessage.id}</code></div>
+ <div><strong>Status:</strong> <Pill kind={STATUS_KINDS[selectedMessage.status] || 'gray'}>{selectedMessage.status}</Pill></div>
+ <div><strong>Attempts:</strong> {selectedMessage.attempts} / {selectedMessage.max_attempts}</div>
+ <div><strong>Created:</strong> {new Date(selectedMessage.created_at).toLocaleString()}</div>
+ {selectedMessage.error_message && (
+ <div className="queue-message-error"><strong>Error:</strong> {selectedMessage.error_message}</div>
+ )}
+ <div className="queue-message-section"><strong>Payload:</strong>
+ <pre>{JSON.stringify(selectedMessage.payload, null, 2)}</pre>
+ </div>
+ {selectedMessage.result && (
+ <div className="queue-message-section"><strong>Result:</strong>
+ <pre>{JSON.stringify(selectedMessage.result, null, 2)}</pre>
+ </div>
+ )}
+ </div>
+ {!viewOnly && (selectedMessage.status === 'failed' || selectedMessage.status === 'dead_letter') && (
+ <div className="queue-detail-panel-footer">
+ <Button onClick={() => handleRequeue(selectedMessage)}>
+ <RefreshCw size={14} className="mr-2" /> Requeue
+ </Button>
+ </div>
+ )}
+ </aside>
+ )}
+ </div>
+
+ {showSend && !viewOnly && (
+ <div className="modal-overlay" onClick={() => setShowSend(false)}>
+ <div className="modal" onClick={e => e.stopPropagation()}>
+ <div className="modal-header">
+ <h2>Send Message</h2>
+ <button className="modal-close" onClick={() => setShowSend(false)}>&times;</button>
+ </div>
+ <form onSubmit={handleSend}>
+ <div className="modal-body">
+ <div className="form-group">
+ <Label htmlFor="payload">Payload (JSON)</Label>
+ <Textarea id="payload" value={sendForm.payload} onChange={(e) => setSendForm({ ...sendForm, payload: e.target.value })} rows={6} required />
+ </div>
+ <div className="form-row">
+ <div className="form-group">
+ <Label htmlFor="priority">Priority</Label>
+ <Input id="priority" type="number" value={sendForm.priority} onChange={(e) => setSendForm({ ...sendForm, priority: e.target.value })} />
+ </div>
+ <div className="form-group">
+ <Label htmlFor="delay_ms">Delay (ms)</Label>
+ <Input id="delay_ms" type="number" value={sendForm.delay_ms} onChange={(e) => setSendForm({ ...sendForm, delay_ms: e.target.value })} />
+ </div>
+ </div>
+ </div>
+ <div className="modal-footer">
+ <Button type="button" variant="outline" onClick={() => setShowSend(false)}>Cancel</Button>
+ <Button type="submit"><Send size={14} className="mr-2" /> Send</Button>
+ </div>
+ </form>
+ </div>
+ </div>
+ )}
+
+ <ConfirmDialog
+ isOpen={confirmState.isOpen}
+ title={confirmState.title}
+ message={confirmState.message}
+ confirmText={confirmState.confirmText}
+ cancelText={confirmState.cancelText}
+ variant={confirmState.variant}
+ onConfirm={handleConfirm}
+ onCancel={handleCancel}
+ />
+ </div>
+ );
+};
+
+export default QueueDetail;
diff --git a/frontend/src/pages/QueueOperations.jsx b/frontend/src/pages/QueueOperations.jsx
index 1ef87f17..774f2ed5 100644
--- a/frontend/src/pages/QueueOperations.jsx
+++ b/frontend/src/pages/QueueOperations.jsx
@@ -1,4 +1,5 @@
import { useState, useEffect, useRef, useCallback, useMemo } from 'react';
+import { useNavigate } from 'react-router-dom';
import {
Layers,
Inbox,
@@ -65,12 +66,8 @@ const QueueOperations = () => {
const [sendTarget, setSendTarget] = useState(null);
const [sendForm, setSendForm] = useState({ payload: '{}', priority: 0, delay_ms: 0 });
- const [messageModalQueue, setMessageModalQueue] = useState(null);
- const [messages, setMessages] = useState([]);
- const [modalMessageFilter, setModalMessageFilter] = useState('all');
- const [selectedMessage, setSelectedMessage] = useState(null);
-
const pollRef = useRef(null);
+ const navigate = useNavigate();
const loadData = useCallback(async () => {
try {
@@ -104,19 +101,6 @@ const QueueOperations = () => {
}
}, [groups, toast]);
- const loadMessages = useCallback(async (groupSlug, queueSlug, status) => {
- if (!groupSlug || !queueSlug) return;
- try {
- const res = await api.getMessages(groupSlug, queueSlug, {
- status: status === 'all' ? undefined : status,
- limit: 100,
- });
- setMessages(res.messages || []);
- } catch (err) {
- toast.error(err.message);
- }
- }, [toast]);
-
useEffect(() => {
loadData();
}, [loadData]);
@@ -126,14 +110,11 @@ const QueueOperations = () => {
pollRef.current = setInterval(() => {
loadData();
loadQueues(selectedGroup);
- if (messageModalQueue) {
- loadMessages(messageModalQueue.group_slug, messageModalQueue.slug, modalMessageFilter);
- }
}, POLL_INTERVAL);
return () => {
if (pollRef.current) clearInterval(pollRef.current);
};
- }, [selectedGroup, loadData, loadQueues, messageModalQueue, modalMessageFilter, loadMessages]);
+ }, [selectedGroup, loadData, loadQueues]);
const totalQueues = useMemo(
() => groups.reduce((acc, g) => acc + (g.stats?.queues || 0), 0),
@@ -164,6 +145,13 @@ const QueueOperations = () => {
[groups, selectedGroup]
);
+ // System-owned groups are read-only: their queues can be viewed but not
+ // mutated (the backend enforces this too). Used to hide destructive actions.
+ const systemGroupSlugs = useMemo(
+ () => new Set(groups.filter(g => g.owner_type === 'system').map(g => g.slug)),
+ [groups]
+ );
+
const handleCreateGroup = async (e) => {
e.preventDefault();
try {
@@ -255,46 +243,13 @@ const QueueOperations = () => {
setSendTarget(null);
loadQueues(selectedGroup);
loadData();
- if (messageModalQueue?.slug === queue.slug && messageModalQueue?.group_slug === queue.group_slug) {
- loadMessages(queue.group_slug, queue.slug, modalMessageFilter);
- }
} catch (err) {
toast.error(err.message);
}
};
- const openMessagesModal = (queue) => {
- setMessageModalQueue(queue);
- setModalMessageFilter(messageFilter === 'all' ? 'all' : messageFilter);
- loadMessages(queue.group_slug, queue.slug, messageFilter === 'all' ? 'all' : messageFilter);
- };
-
- const handleRequeueMessage = async (msg) => {
- try {
- await api.requeueMessage(msg.group_slug, msg.queue_slug, msg.id);
- toast.success('Message requeued');
- loadMessages(msg.group_slug, msg.queue_slug, modalMessageFilter);
- loadData();
- } catch (err) {
- toast.error(err.message);
- }
- };
-
- const handleDeleteMessage = async (msg) => {
- const confirmed = await confirm({
- title: 'Delete Message',
- message: 'Permanently delete this message?',
- variant: 'danger',
- });
- if (!confirmed) return;
- try {
- await api.deleteMessage(msg.group_slug, msg.queue_slug, msg.id);
- toast.success('Message deleted');
- loadMessages(msg.group_slug, msg.queue_slug, modalMessageFilter);
- loadData();
- } catch (err) {
- toast.error(err.message);
- }
+ const openQueue = (queue) => {
+ navigate(`/queue/${encodeURIComponent(queue.group_slug)}/${encodeURIComponent(queue.slug)}`);
};
const hasActiveFilters = selectedGroup !== '' || messageFilter !== 'all' || Boolean(searchTerm);
@@ -494,7 +449,7 @@ const QueueOperations = () => {
<tr
key={queue.id}
className="is-clickable"
- onClick={() => openMessagesModal(queue)}
+ onClick={() => openQueue(queue)}
>
<td>
<div className="queue-row-name">
@@ -524,15 +479,19 @@ const QueueOperations = () => {
<td>{new Date(queue.created_at).toLocaleString()}</td>
<td className="col-actions" onClick={e => e.stopPropagation()}>
<div className="queue-actions">
- <Button variant="ghost" size="sm" onClick={() => openSendModal(queue)}>
- <Send size={14} />
- </Button>
- <Button variant="ghost" size="sm" onClick={() => openMessagesModal(queue)}>
+ {!systemGroupSlugs.has(queue.group_slug) && (
+ <Button variant="ghost" size="sm" onClick={() => openSendModal(queue)} title="Send message">
+ <Send size={14} />
+ </Button>
+ )}
+ <Button variant="ghost" size="sm" onClick={() => openQueue(queue)} title="View messages">
<Inbox size={14} />
</Button>
- <Button variant="ghost" size="sm" onClick={() => handleDeleteQueue(queue)}>
- <Trash2 size={14} />
- </Button>
+ {!systemGroupSlugs.has(queue.group_slug) && (
+ <Button variant="ghost" size="sm" onClick={() => handleDeleteQueue(queue)} title="Delete queue">
+ <Trash2 size={14} />
+ </Button>
+ )}
</div>
</td>
</tr>
@@ -667,123 +626,6 @@ const QueueOperations = () => {
</div>
)}
- {/* Messages Modal */}
- {messageModalQueue && (
- <div className="modal-overlay" onClick={() => setMessageModalQueue(null)}>
- <div className="modal modal--wide" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <div>
- <h2>{messageModalQueue.name} Messages</h2>
- <span className="modal-header-sub">{messageModalQueue.group_slug} / {messageModalQueue.slug}</span>
- </div>
- <button className="modal-close" onClick={() => setMessageModalQueue(null)}>&times;</button>
- </div>
- <div className="modal-body">
- <div className="queue-messages-toolbar">
- <div className="queue-messages-selects">
- <select
- className="queue-select"
- value={modalMessageFilter}
- onChange={(e) => {
- setModalMessageFilter(e.target.value);
- loadMessages(messageModalQueue.group_slug, messageModalQueue.slug, e.target.value);
- }}
- >
- <option value="all">All statuses</option>
- {STATUS_ORDER.map(s => (
- <option key={s} value={s}>{STATUS_LABELS[s]}</option>
- ))}
- </select>
- </div>
- <div className="queue-messages-actions">
- <Button variant="outline" size="sm" onClick={() => openSendModal(messageModalQueue)}>
- <Send size={14} className="mr-2" /> Send Message
- </Button>
- <Button variant="outline" size="sm" onClick={() => loadMessages(messageModalQueue.group_slug, messageModalQueue.slug, modalMessageFilter)}>
- <RefreshCw size={14} className="mr-2" /> Refresh
- </Button>
- </div>
- </div>
-
- {messages.length === 0 ? (
- <EmptyState icon={Inbox} title="No Messages" description="This queue is empty. Send a message to get started." />
- ) : (
- <table className="sk-dtable queue-table">
- <thead>
- <tr>
- <th>Status</th>
- <th>Payload</th>
- <th>Attempts</th>
- <th>Created</th>
- <th aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {messages.map(msg => (
- <tr key={msg.id} className="is-clickable" onClick={() => setSelectedMessage(msg)}>
- <td><Pill kind={STATUS_KINDS[msg.status] || 'gray'}>{msg.status}</Pill></td>
- <td><code className="queue-payload-preview">{JSON.stringify(msg.payload).slice(0, 80)}</code></td>
- <td>{msg.attempts} / {msg.max_attempts}</td>
- <td>{new Date(msg.created_at).toLocaleString()}</td>
- <td onClick={e => e.stopPropagation()}>
- <div className="queue-actions">
- {(msg.status === 'failed' || msg.status === 'dead_letter') && (
- <Button variant="ghost" size="sm" onClick={() => handleRequeueMessage(msg)}>
- <RefreshCw size={14} />
- </Button>
- )}
- <Button variant="ghost" size="sm" onClick={() => handleDeleteMessage(msg)}>
- <Trash2 size={14} />
- </Button>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- )}
- </div>
- </div>
- </div>
- )}
-
- {/* Message Detail Modal */}
- {selectedMessage && (
- <div className="modal-overlay" onClick={() => setSelectedMessage(null)}>
- <div className="modal modal--wide" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Message Detail</h2>
- <button className="modal-close" onClick={() => setSelectedMessage(null)}>&times;</button>
- </div>
- <div className="modal-body">
- <div className="queue-message-detail">
- <div><strong>ID:</strong> <code>{selectedMessage.id}</code></div>
- <div><strong>Status:</strong> <Pill kind={STATUS_KINDS[selectedMessage.status] || 'gray'}>{selectedMessage.status}</Pill></div>
- <div><strong>Attempts:</strong> {selectedMessage.attempts} / {selectedMessage.max_attempts}</div>
- <div><strong>Created:</strong> {new Date(selectedMessage.created_at).toLocaleString()}</div>
- {selectedMessage.error_message && (
- <div className="queue-message-error"><strong>Error:</strong> {selectedMessage.error_message}</div>
- )}
- <div className="queue-message-section"><strong>Payload:</strong>
- <pre>{JSON.stringify(selectedMessage.payload, null, 2)}</pre>
- </div>
- {selectedMessage.result && (
- <div className="queue-message-section"><strong>Result:</strong>
- <pre>{JSON.stringify(selectedMessage.result, null, 2)}</pre>
- </div>
- )}
- </div>
- </div>
- <div className="modal-footer">
- <Button type="button" variant="outline" onClick={() => setSelectedMessage(null)}>Close</Button>
- {(selectedMessage.status === 'failed' || selectedMessage.status === 'dead_letter') && (
- <Button onClick={() => { handleRequeueMessage(selectedMessage); setSelectedMessage(null); }}>Requeue</Button>
- )}
- </div>
- </div>
- </div>
- )}
-
<ConfirmDialog
isOpen={confirmState.isOpen}
title={confirmState.title}
diff --git a/frontend/src/pages/WorkspaceDetail.jsx b/frontend/src/pages/WorkspaceDetail.jsx
index 937a507d..1e8be82c 100644
--- a/frontend/src/pages/WorkspaceDetail.jsx
+++ b/frontend/src/pages/WorkspaceDetail.jsx
@@ -1,28 +1,39 @@
import { useState, useEffect, useCallback } from 'react';
import { useParams, useNavigate, Link } from 'react-router-dom';
+import useTabParam from '../hooks/useTabParam';
import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import { useAuth } from '../contexts/AuthContext';
import Spinner from '../components/Spinner';
import ConfirmDialog from '../components/ConfirmDialog';
import EmptyState from '../components/EmptyState';
-import { Pill, ServiceTile, SegControl } from '@/components/ds';
+import { Pill, ServiceTile, PageTopbar } 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,
+ LayoutGrid, ChevronLeft, Server, Box, Globe,
+ Users, Settings2,
} from 'lucide-react';
+import WorkspaceOverviewTab from '../components/workspaces/WorkspaceOverviewTab';
+import WorkspaceServersTab from '../components/workspaces/WorkspaceServersTab';
+import WorkspaceServicesTab from '../components/workspaces/WorkspaceServicesTab';
+import WorkspaceSitesTab from '../components/workspaces/WorkspaceSitesTab';
+import WorkspaceMembersTab from '../components/workspaces/WorkspaceMembersTab';
+import WorkspaceSettingsTab from '../components/workspaces/WorkspaceSettingsTab';
-// Mirrors WorkspaceSwitcher: the active workspace lives in localStorage and is
-// sent ambiently as the X-Workspace-Id header; switching reloads so every page
-// re-fetches under the new scope.
const ACTIVE_KEY = 'active_workspace_id';
const ACCENT_KEY = 'workspace_accent';
+const VALID_TABS = ['overview', 'servers', 'services', 'sites', 'members', 'settings'];
+
+const TAB_META = {
+ overview: { label: 'Overview', icon: LayoutGrid },
+ servers: { label: 'Servers', icon: Server },
+ services: { label: 'Services', icon: Box },
+ sites: { label: 'Sites', icon: Globe },
+ members: { label: 'Members', icon: Users },
+ settings: { label: 'Settings', icon: Settings2 },
+};
+
const formatSince = (iso) => {
if (!iso) return null;
const d = new Date(iso);
@@ -31,8 +42,7 @@ const formatSince = (iso) => {
: d.toLocaleDateString(undefined, { month: 'short', year: 'numeric' });
};
-const SERVER_PILL = { online: 'green', pending: 'amber', offline: 'red' };
-const APP_PILL = { running: 'green', stopped: 'gray', failed: 'red' };
+const asServerList = (data) => (Array.isArray(data) ? data : (data?.servers || []));
const WorkspaceDetail = () => {
const { id } = useParams();
@@ -40,6 +50,7 @@ const WorkspaceDetail = () => {
const navigate = useNavigate();
const toast = useToast();
const { user } = useAuth();
+ const [activeTab, setActiveTab] = useTabParam(`/workspaces/${id}`, VALID_TABS, 'overview');
const [ws, setWs] = useState(null);
const [members, setMembers] = useState([]);
@@ -47,20 +58,13 @@ const WorkspaceDetail = () => {
const [servers, setServers] = useState([]);
const [allUsers, setAllUsers] = useState([]);
const [loading, setLoading] = useState(true);
- const [tab, setTab] = useState('servers');
- const [showEdit, setShowEdit] = useState(false);
- const [form, setForm] = useState(null);
const [deleteConfirm, setDeleteConfirm] = useState(false);
const [sharingApp, setSharingApp] = useState(null);
const [grants, setGrants] = useState([]);
const [grantRole, setGrantRole] = useState('editor');
- const asServerList = (data) => (Array.isArray(data) ? data : (data?.servers || []));
-
const load = useCallback(async () => {
try {
- // allWorkspaces neutralizes the ambient X-Workspace-Id header so the
- // move-in pickers can see resources living in other workspaces.
const [wsData, mData, appData, srvData, uData] = await Promise.all([
api.getWorkspace(wsId),
api.getWorkspaceMembers(wsId).catch(() => ({ members: [] })),
@@ -117,35 +121,6 @@ const WorkspaceDetail = () => {
} catch (err) { toast.error(err.message); }
};
- const openEdit = () => {
- setForm({
- name: ws.name,
- description: ws.description || '',
- 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 {
- 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();
- } catch (err) { toast.error(err.message); }
- };
-
const handleAddMember = async (userId) => {
try {
await api.addWorkspaceMember(wsId, userId);
@@ -179,7 +154,6 @@ const WorkspaceDetail = () => {
} catch (err) { toast.error(err.message); }
};
- // Per-app sharing (#33 per-site ACL), re-homed from the old list-page modal.
const loadSharing = async (appObj) => {
try {
const gData = await api.getAppGrants(appObj.id);
@@ -206,7 +180,7 @@ const WorkspaceDetail = () => {
} catch (err) { toast.error(err.message); }
};
- if (loading) return <Spinner />;
+ if (loading) return <div className="page-container workspaces-page ws-detail"><Spinner /></div>;
if (!ws) {
return (
@@ -225,311 +199,118 @@ const WorkspaceDetail = () => {
const sites = appsIn.filter(a => a.app_type === 'wordpress');
const since = formatSince(ws.created_at);
- const tabs = [
- { key: 'servers', label: 'Servers', icon: Server, count: srvIn.length },
- { key: 'services', label: 'Services', icon: Box, count: services.length },
- { key: 'sites', label: 'Sites', icon: Globe, count: sites.length },
- { key: 'members', label: 'Members', icon: Users, count: members.length },
- ];
-
- const appRows = (list) => (
- list.length === 0 ? (
- <EmptyState icon={tab === 'sites' ? Globe : Box} title={`No ${tab} in this workspace yet`} description="Move one in below." />
- ) : (
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead>
- <tr><th>{tab === 'sites' ? 'Site' : 'Service'}</th><th>Status</th><th style={{ width: 220 }} /></tr>
- </thead>
- <tbody>
- {list.map(a => (
- <tr key={a.id} className="is-clickable" onClick={() => navigate(`/services/${a.id}`)}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={a.name} size={30} />
- <div>
- <div>{a.name}</div>
- <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
- </div>
- </div>
- </td>
- <td><Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill></td>
- <td onClick={e => e.stopPropagation()}>
- <div className="ws-detail__rowactions">
- <Button size="sm" variant="outline" onClick={() => loadSharing(a)}>Share</Button>
- <Button size="sm" variant="destructive" onClick={() => handleMoveApp(a.id, null)}>Remove</Button>
- <span className="ws-detail__manage" onClick={() => navigate(`/services/${a.id}`)}>
- Manage <ChevronRight size={13} />
- </span>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
- )
- );
-
- const movePicker = (label, items, render, onPick) => items.length > 0 && (
- <>
- <div className="ws-pick-label">{label}</div>
- <div className="ws-pick">
- {items.map(item => (
- <div key={item.id} className="ws-pick__item" onClick={() => onPick(item)}>
- {render(item)}
- <Plus size={14} className="ws-pick__plus" />
- </div>
- ))}
- </div>
- </>
- );
-
return (
- <div className="page-container workspaces-page ws-detail">
- <Link className="ws-detail__back" to="/workspaces"><ChevronLeft size={14} /> All workspaces</Link>
-
- <header className="ws-detail__header">
- <ServiceTile name={ws.name} size={54} gradient={ws.primary_color || undefined} className="ws-detail__tile" />
- <div className="ws-detail__info">
- <div className="ws-detail__title">
- <h1>{ws.name}</h1>
- {isCurrent
- ? <Pill kind="green">active workspace</Pill>
- : <Pill kind={ws.status === 'active' ? 'green' : 'amber'}>{ws.status}</Pill>}
- </div>
- <div className="ws-detail__meta">
- <span>/{ws.slug}</span>
- <span className="dotsep">·</span>
- <span>{members.length} member{members.length !== 1 ? 's' : ''}</span>
- {since && <><span className="dotsep">·</span><span>since {since}</span></>}
+ <div className="app-detail-page app-detail-page--wide ws-detail-page">
+ <PageTopbar
+ className="ws-detail-topbar"
+ icon={<LayoutGrid size={18} />}
+ title={(
+ <span className="ws-crumbs">
+ <Link to="/workspaces">Workspaces</Link>
+ <span className="ws-crumbs__sep">/</span>
+ <span className="ws-crumbs__cur">{ws.name}</span>
+ </span>
+ )}
+ />
+
+ <div className="app-detail-body">
+ <div className="app-detail-header">
+ <ServiceTile name={ws.name} size={54} gradient={ws.primary_color || undefined} className="ws-detail__tile" />
+ <div className="app-detail-title-block">
+ <h1>
+ {ws.name}
+ {isCurrent
+ ? <Pill kind="green">active workspace</Pill>
+ : <Pill kind={ws.status === 'active' ? 'green' : 'amber'}>{ws.status}</Pill>}
+ </h1>
+ <div className="app-detail-subtitle">
+ <span>/{ws.slug}</span>
+ <span className="separator">·</span>
+ <span>{members.length} member{members.length !== 1 ? 's' : ''}</span>
+ {since && <><span className="separator">·</span><span>since {since}</span></>}
+ </div>
</div>
</div>
- <div className="ws-detail__actions">
- {!isCurrent && ws.status === 'active' && (
- <Button size="sm" onClick={setActiveWorkspace}><Check size={15} /> Set active</Button>
- )}
- <Button size="sm" variant="outline" onClick={openEdit}><Settings2 size={15} /> Settings</Button>
- {ws.status === 'active'
- ? <Button size="sm" variant="secondary" onClick={handleArchive}><Archive size={15} /> Archive</Button>
- : <Button size="sm" variant="secondary" onClick={handleRestore}><ArchiveRestore size={15} /> Restore</Button>}
- {user?.is_admin && (
- <Button size="sm" variant="destructive" onClick={() => setDeleteConfirm(true)}><Trash2 size={15} /></Button>
- )}
- </div>
- </header>
-
- {ws.description && <p className="ws-detail__desc">{ws.description}</p>}
-
- <div className="ws-detail__grid">
- <section className="ws-detail__card">
- <h3>Workspace</h3>
- <div className="sk-info-row"><span className="k">Slug</span><span className="v">/{ws.slug}</span></div>
- <div className="sk-info-row"><span className="k">Created</span><span className="v">{since || '—'}</span></div>
- <div className="sk-info-row"><span className="k">Max servers</span><span className="v">{ws.max_servers > 0 ? ws.max_servers : 'Unlimited'}</span></div>
- <div className="sk-info-row"><span className="k">Max users</span><span className="v">{ws.max_users > 0 ? ws.max_users : 'Unlimited'}</span></div>
- </section>
- <section className="ws-detail__card">
- <h3>Resources</h3>
- <div className="ws-card__stats ws-detail__stats">
- <div><div className="v">{srvIn.length}</div><div className="l">Servers</div></div>
- <div><div className="v">{services.length}</div><div className="l">Services</div></div>
- <div><div className="v">{sites.length}</div><div className="l">Sites</div></div>
- <div><div className="v">{members.length}</div><div className="l">Members</div></div>
- </div>
- </section>
- </div>
- <nav className="ws-detail__tabs" aria-label="Workspace sections">
- {tabs.map(t => (
- <button
- key={t.key}
- type="button"
- className={`ws-detail__tab ${tab === t.key ? 'is-active' : ''}`}
- onClick={() => setTab(t.key)}
- >
- <t.icon size={15} /> {t.label} <span className="ws-detail__tabcount">{t.count}</span>
- </button>
- ))}
- </nav>
-
- <div className="ws-detail__pane">
- {tab === 'servers' && (
- <>
- {srvIn.length === 0 ? (
- <EmptyState icon={Server} title="No servers in this workspace yet" description="Move one in below." />
- ) : (
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Server</th><th>Status</th><th style={{ width: 160 }} /></tr></thead>
- <tbody>
- {srvIn.map(s => (
- <tr key={s.id} className="is-clickable" onClick={() => navigate(`/servers/${s.id}`)}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={s.name} size={30} />
- <div>
- <div>{s.name}</div>
- <div className="sk-cell-sub">{s.ip_address || s.hostname || ''}</div>
- </div>
- </div>
- </td>
- <td><Pill kind={SERVER_PILL[s.status] || 'gray'}>{s.status || 'unknown'}</Pill></td>
- <td onClick={e => e.stopPropagation()}>
- <div className="ws-detail__rowactions">
- <Button size="sm" variant="destructive" onClick={() => handleMoveServer(s.id, null)}>Remove</Button>
- <span className="ws-detail__manage" onClick={() => navigate(`/servers/${s.id}`)}>
- Manage <ChevronRight size={13} />
- </span>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
+ {ws.description && <p className="ws-detail__desc">{ws.description}</p>}
+
+ <div className="app-detail-tabs">
+ {VALID_TABS.map((tab) => {
+ const meta = TAB_META[tab];
+ const Icon = meta.icon;
+ return (
+ <div
+ key={tab}
+ className={`app-detail-tab ${activeTab === tab ? 'active' : ''} ${tab === 'settings' ? 'app-detail-tab--end' : ''}`}
+ onClick={() => setActiveTab(tab)}
+ >
+ <Icon size={14} /> {meta.label}
</div>
- )}
- {movePicker(
- 'Move a server into this workspace',
- srvOut,
- s => <span className="ws-pick__name">{s.name}</span>,
- s => handleMoveServer(s.id, wsId),
- )}
- </>
- )}
-
- {(tab === 'services' || tab === 'sites') && (
- <>
- {appRows(tab === 'services' ? services : sites)}
- {movePicker(
- `Move ${tab === 'sites' ? 'a site' : 'an application'} into this workspace`,
- appsOut.filter(a => (tab === 'sites') === (a.app_type === 'wordpress')),
- a => <><span className="ws-pick__name">{a.name}</span><span className="sk-tag">{a.app_type}</span></>,
- a => handleMoveApp(a.id, wsId),
- )}
- </>
- )}
-
- {tab === 'members' && (
- <>
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Member</th><th>Role</th><th style={{ width: 120 }} /></tr></thead>
- <tbody>
- {members.map(m => (
- <tr key={m.id}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={m.username || m.email || '?'} size={30} className="ws-row__av" />
- <div>
- <div>{m.username || m.email}</div>
- {m.username && m.email && <div className="sk-cell-sub">{m.email}</div>}
- </div>
- </div>
- </td>
- <td>
- {m.role === 'owner'
- ? <Pill kind="green">{m.role}</Pill>
- : <span className="sk-tag">{m.role}</span>}
- </td>
- <td>
- {m.role !== 'owner' && (
- <Button size="sm" variant="destructive" onClick={() => handleRemoveMember(m.id)}>Remove</Button>
- )}
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
- {movePicker(
- 'Add a member',
- allUsers.filter(u => !members.find(m => m.user_id === u.id)),
- u => (
- <>
- <ServiceTile name={u.username || u.email || '?'} size={24} className="ws-row__av" />
- <span className="ws-pick__name">{u.username || u.email}</span>
- </>
- ),
- u => handleAddMember(u.id),
- )}
- </>
- )}
- </div>
+ );
+ })}
+ </div>
- {showEdit && form && (
- <div className="modal-overlay" onClick={() => setShowEdit(false)}>
- <div className="modal" onClick={e => e.stopPropagation()}>
- <div className="modal-header">
- <h2>Workspace Settings</h2>
- <button className="modal-close" onClick={() => setShowEdit(false)}>&times;</button>
- </div>
- <div className="modal-body">
- <div className="form-group">
- <label>Name</label>
- <Input value={form.name} onChange={e => setForm({ ...form, name: e.target.value })} />
- </div>
- <div className="form-group">
- <label>Description</label>
- <Textarea value={form.description} onChange={e => setForm({ ...form, description: e.target.value })} rows={2} />
- </div>
- <div className="form-row">
- <div className="form-group">
- <label>Max Servers (0 = unlimited)</label>
- <Input type="number" value={form.max_servers} onChange={e => setForm({ ...form, max_servers: parseInt(e.target.value) || 0 })} />
- </div>
- <div className="form-group">
- <label>Max Users (0 = unlimited)</label>
- <Input type="number" value={form.max_users} onChange={e => setForm({ ...form, max_users: parseInt(e.target.value) || 0 })} />
- </div>
- </div>
- <div className="form-group">
- <label>Brand Color</label>
- <input
- type="color"
- className="workspace-color-input"
- value={form.primary_color}
- onChange={e => setForm({ ...form, primary_color: e.target.value })}
- aria-label="Workspace brand color"
- />
- <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>
- <Button onClick={handleSave} disabled={!form.name}>Save</Button>
- </div>
- </div>
+ <div className="app-detail-content">
+ {activeTab === 'overview' && (
+ <WorkspaceOverviewTab
+ ws={ws}
+ since={since}
+ members={members}
+ srvIn={srvIn}
+ services={services}
+ sites={sites}
+ />
+ )}
+ {activeTab === 'servers' && (
+ <WorkspaceServersTab
+ wsId={wsId}
+ srvIn={srvIn}
+ srvOut={srvOut}
+ onMoveServer={handleMoveServer}
+ />
+ )}
+ {activeTab === 'services' && (
+ <WorkspaceServicesTab
+ wsId={wsId}
+ services={services}
+ appsOut={appsOut.filter(a => a.app_type !== 'wordpress')}
+ onMoveApp={handleMoveApp}
+ onShare={loadSharing}
+ />
+ )}
+ {activeTab === 'sites' && (
+ <WorkspaceSitesTab
+ wsId={wsId}
+ sites={sites}
+ appsOut={appsOut.filter(a => a.app_type === 'wordpress')}
+ onMoveApp={handleMoveApp}
+ onShare={loadSharing}
+ />
+ )}
+ {activeTab === 'members' && (
+ <WorkspaceMembersTab
+ wsId={wsId}
+ members={members}
+ allUsers={allUsers}
+ onAddMember={handleAddMember}
+ onRemoveMember={handleRemoveMember}
+ />
+ )}
+ {activeTab === 'settings' && (
+ <WorkspaceSettingsTab
+ wsId={wsId}
+ ws={ws}
+ onUpdate={load}
+ user={user}
+ isCurrent={isCurrent}
+ onSetActive={setActiveWorkspace}
+ onArchive={handleArchive}
+ onRestore={handleRestore}
+ onDeleteClick={() => setDeleteConfirm(true)}
+ />
+ )}
</div>
- )}
+ </div>
{sharingApp && (
<div className="modal-overlay" onClick={() => setSharingApp(null)}>
@@ -539,7 +320,7 @@ const WorkspaceDetail = () => {
<button className="modal-close" onClick={() => setSharingApp(null)}>&times;</button>
</div>
<div className="modal-body">
- <p className="form-hint">Grant a user access to this application (and its WordPress site, databases, and domains) without transferring ownership.</p>
+ <p className="form-hint">Grant a user access to this application without transferring ownership.</p>
<div className="ws-rows">
{grants.length === 0 && <p className="form-hint">Not shared with anyone yet.</p>}
{grants.map(g => (
@@ -557,21 +338,17 @@ const WorkspaceDetail = () => {
<h4>Grant Access</h4>
<div className="form-group">
<label>Role for new grants</label>
- <SegControl
- value={grantRole}
- onChange={setGrantRole}
- options={[
- { value: 'editor', label: 'Editor · view + operate' },
- { value: 'viewer', label: 'Viewer · read-only' },
- ]}
- />
+ <select value={grantRole} onChange={e => setGrantRole(e.target.value)}>
+ <option value="editor">Editor · view + operate</option>
+ <option value="viewer">Viewer · read-only</option>
+ </select>
</div>
<div className="ws-pick">
{allUsers.filter(u => u.id !== sharingApp.user_id && !grants.find(g => g.user_id === u.id)).map(u => (
<div key={u.id} className="ws-pick__item" onClick={() => handleGrant(u.id)}>
<ServiceTile name={u.username || u.email || '?'} size={24} className="ws-row__av" />
<span className="ws-pick__name">{u.username || u.email}</span>
- <Plus size={14} className="ws-pick__plus" />
+ <span className="ws-pick__plus">+</span>
</div>
))}
</div>
diff --git a/frontend/src/styles/layout/_sidebar.scss b/frontend/src/styles/layout/_sidebar.scss
index 50801f97..f3bdb4d8 100644
--- a/frontend/src/styles/layout/_sidebar.scss
+++ b/frontend/src/styles/layout/_sidebar.scss
@@ -267,35 +267,39 @@
// Scrollable Navigation Container
// Active-workspace selector (#33) — sits between the brand and the nav.
-.workspace-switcher {
- display: flex;
- align-items: center;
- gap: $space-2;
+// Uses the Radix Select UI component so the dropdown is fully theme-aware.
+.workspace-switcher__trigger.ui-select-trigger {
+ width: calc(100% - #{$space-6});
margin: 0 $space-3 $space-2;
padding: $space-1 $space-2;
background-color: $bg-card;
border: 1px solid $border-default;
border-radius: $radius-md;
+ color: $text-primary;
+ font-size: $font-size-sm;
+ cursor: pointer;
+ transition: border-color $transition-base, background-color $transition-base;
- &__icon {
+ &:hover {
+ border-color: $border-active;
+ background-color: $bg-hover;
+ }
+
+ &:focus-visible {
+ outline: 2px solid $accent-primary;
+ outline-offset: 1px;
+ }
+
+ .workspace-switcher__icon {
flex-shrink: 0;
color: $text-secondary;
}
- &__select {
- flex: 1;
- min-width: 0;
- border: none;
- background: transparent;
- color: $text-primary;
- font-size: $font-size-sm;
- cursor: pointer;
- outline: none;
-
- &:focus-visible {
- outline: 2px solid $accent-primary;
- outline-offset: 1px;
- }
+ // Value text wrapper
+ > span:first-of-type {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
@@ -739,7 +743,7 @@
}
.brand-section,
- .workspace-switcher,
+ .workspace-switcher__trigger,
.user-mini {
justify-content: center;
gap: 0;
@@ -749,7 +753,8 @@
.brand-star,
.nav-category,
.nav-expand-btn,
- .workspace-switcher__select,
+ .workspace-switcher__trigger > span,
+ .workspace-switcher__trigger .ui-select-icon,
.user-meta,
.user-menu-arrow {
display: none;
@@ -802,7 +807,7 @@
flex-shrink: 0;
}
- .workspace-switcher {
+ .workspace-switcher__trigger {
margin: 0;
flex-shrink: 0;
max-width: 170px;
diff --git a/frontend/src/styles/pages/_queue-operations.scss b/frontend/src/styles/pages/_queue-operations.scss
index 916020fd..667428bd 100644
--- a/frontend/src/styles/pages/_queue-operations.scss
+++ b/frontend/src/styles/pages/_queue-operations.scss
@@ -505,3 +505,160 @@
font-size: $font-size-sm;
font-family: $font-mono;
}
+
+/* ------------------------------------------------------------------ */
+/* Queue detail page */
+/* ------------------------------------------------------------------ */
+
+.queue-detail {
+ display: flex;
+ flex-direction: column;
+ gap: $space-5;
+ padding: $space-5;
+}
+
+.queue-back {
+ align-self: flex-start;
+ display: inline-flex;
+ align-items: center;
+ gap: $space-2;
+ padding: $space-1 0;
+ border: none;
+ background: transparent;
+ color: $text-secondary;
+ font-size: $font-size-sm;
+ font-weight: $font-weight-medium;
+ cursor: pointer;
+
+ svg {
+ color: $text-tertiary;
+ }
+
+ &:hover {
+ color: $accent-primary;
+
+ svg {
+ color: $accent-primary;
+ }
+ }
+}
+
+.queue-detail-header {
+ display: flex;
+ flex-direction: column;
+ gap: $space-3;
+}
+
+.queue-detail-headline {
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+ gap: $space-4;
+ flex-wrap: wrap;
+}
+
+.queue-detail-actions {
+ display: flex;
+ align-items: center;
+ gap: $space-2;
+ flex-wrap: wrap;
+
+ .btn {
+ gap: $space-2;
+ }
+}
+
+.queue-readonly-badge {
+ display: inline-flex;
+ align-items: center;
+ gap: $space-1;
+ padding: $space-1 $space-3;
+ border-radius: $radius-full;
+ background: $bg-elevated;
+ border: 1px solid $border-subtle;
+ color: $text-tertiary;
+ font-size: $font-size-xs;
+ font-weight: $font-weight-semibold;
+ text-transform: uppercase;
+ letter-spacing: 0.05em;
+
+ svg {
+ color: $text-tertiary;
+ }
+}
+
+.queue-detail-stats {
+ display: grid;
+ grid-template-columns: repeat(auto-fit, minmax(140px, 1fr));
+ gap: $space-3;
+}
+
+.queue-detail-body {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr);
+ gap: $space-4;
+ align-items: start;
+
+ &.has-panel {
+ grid-template-columns: minmax(0, 1fr) 380px;
+
+ @media (max-width: $breakpoint-lg) {
+ grid-template-columns: minmax(0, 1fr);
+ }
+ }
+}
+
+.queue-detail-main {
+ min-width: 0;
+}
+
+.queue-detail-panel {
+ border: 1px solid $border-subtle;
+ border-radius: $radius-2xl;
+ background: $bg-card;
+ box-shadow: $shadow-sm;
+ padding: $space-4;
+ position: sticky;
+ top: $space-4;
+ max-height: calc(100vh - #{$space-6});
+ overflow: auto;
+}
+
+.queue-detail-panel-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ margin-bottom: $space-3;
+
+ h2 {
+ margin: 0;
+ font-size: $font-size-lg;
+ font-weight: $font-weight-bold;
+ color: $text-primary;
+ }
+}
+
+.queue-panel-close {
+ display: inline-flex;
+ padding: $space-1;
+ border: none;
+ border-radius: $radius-lg;
+ background: transparent;
+ color: $text-tertiary;
+ cursor: pointer;
+
+ &:hover {
+ color: $text-primary;
+ background: $bg-hover;
+ }
+}
+
+.queue-detail-panel-footer {
+ margin-top: $space-4;
+ padding-top: $space-3;
+ border-top: 1px solid $border-subtle;
+}
+
+.queue-table tbody tr.is-selected {
+ background: $accent-glow;
+}
diff --git a/frontend/src/styles/pages/_workspaces.scss b/frontend/src/styles/pages/_workspaces.scss
index c94681c9..fb0c045e 100644
--- a/frontend/src/styles/pages/_workspaces.scss
+++ b/frontend/src/styles/pages/_workspaces.scss
@@ -210,55 +210,66 @@
}
}
- // ── clickable "add / move into this workspace" lists ────
- .ws-pick-label {
- margin: $space-4 0 $space-2;
- font-family: var(--mono);
- font-size: 10px;
- font-weight: $font-weight-semibold;
- letter-spacing: 0.08em;
- text-transform: uppercase;
- color: var(--text-ghost);
- }
+}
- .ws-pick {
- max-height: 200px;
- overflow-y: auto;
- border: 1px solid var(--border-soft);
- border-radius: var(--radius-sm);
- background: var(--surface-2);
- @include custom-scrollbar();
+// ── clickable "add / move into this workspace" lists ────
+.ws-pick-label {
+ margin: $space-4 0 $space-2;
+ font-family: var(--mono);
+ font-size: 10px;
+ font-weight: $font-weight-semibold;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+ color: var(--text-ghost);
+}
- &__item {
- display: flex;
- align-items: center;
- gap: 10px;
- padding: 9px 12px;
- cursor: pointer;
- transition: background 0.12s;
+.ws-pick {
+ width: 100%;
+ max-height: 260px;
+ overflow-y: auto;
+ border: 1px solid var(--border-soft);
+ border-radius: var(--radius);
+ background: var(--surface);
+ @include custom-scrollbar();
+
+ &__item {
+ display: flex;
+ align-items: center;
+ gap: 11px;
+ padding: 10px 14px;
+ cursor: pointer;
+ transition: background 0.12s, border-color 0.12s;
- + .ws-pick__item { border-top: 1px solid var(--border-soft); }
+ + .ws-pick__item { border-top: 1px solid var(--border-soft); }
- &:hover {
- background: var(--surface-hover);
+ &:hover {
+ background: var(--accent-bg-soft);
- .ws-pick__plus { color: var(--accent-bright); }
+ .ws-pick__plus {
+ color: var(--accent-bright);
+ transform: scale(1.1);
}
}
+ }
- &__name {
- flex: 1;
- min-width: 0;
- font-size: 13px;
- color: var(--text);
- @include truncate();
- }
+ &__tile {
+ flex-shrink: 0;
+ border-radius: 8px;
+ }
- &__plus {
- flex-shrink: 0;
- color: var(--text-ghost);
- transition: color 0.12s;
- }
+ &__name {
+ flex: 1;
+ min-width: 0;
+ font-size: 13px;
+ font-weight: $font-weight-medium;
+ color: var(--text);
+ @include truncate();
+ }
+
+ &__plus {
+ flex-shrink: 0;
+ color: var(--text-ghost);
+ transition: color 0.12s, transform 0.12s;
}
}
@@ -366,7 +377,46 @@
}
&__stats { margin: $space-3 0 0; }
+}
+.ws-resource-stats {
+ display: grid;
+ grid-template-columns: repeat(2, 1fr);
+ gap: $space-3;
+
+ &__item {
+ padding: $space-3;
+ background: var(--surface-2);
+ border: 1px solid var(--border-soft);
+ border-radius: var(--radius-sm);
+ text-align: center;
+ transition: background 0.12s, border-color 0.12s;
+
+ &:hover {
+ background: var(--surface-hover);
+ border-color: var(--border-strong);
+ }
+ }
+
+ &__value {
+ font-family: var(--mono);
+ font-size: 24px;
+ font-weight: $font-weight-semibold;
+ color: var(--text);
+ line-height: 1.2;
+ }
+
+ &__label {
+ margin-top: 4px;
+ font-size: 11.5px;
+ font-weight: $font-weight-medium;
+ letter-spacing: 0.04em;
+ text-transform: uppercase;
+ color: var(--text-faint);
+ }
+}
+
+.ws-detail {
// tab strip (prototype wp-tabs: accent underline + mono counts)
&__tabs {
display: flex;
@@ -431,12 +481,93 @@
&:hover { color: var(--accent-bright); }
}
+}
+
+.main-content:has(.ws-detail-page) {
+ padding: 0;
@media (max-width: $breakpoint-md) {
- &__header { flex-wrap: wrap; }
- &__actions { width: 100%; }
- &__tabs { overflow-x: auto; }
+ padding: calc(#{$mobile-header-height} + env(safe-area-inset-top) + #{$space-5}) $space-5 $space-5;
+ }
+}
+
+// Workspace detail page using the shared app-detail-page chrome.
+.ws-detail-page {
+ gap: 0;
+
+ // Full-bleed top bar with breadcrumb + title; matches the WordPress/service
+ // detail pages and the Workspaces list page chrome.
+ .ws-detail-topbar {
+ padding: 10px $space-4;
+ flex-wrap: wrap;
+ row-gap: 8px;
+
+ .sk-topbar__spacer { display: none; }
+ .sk-topbar__titles { flex-shrink: 0; }
+
+ .ws-crumbs {
+ display: inline-flex;
+ align-items: center;
+ gap: 8px;
+ white-space: nowrap;
+
+ a {
+ color: var(--text-dim);
+ text-decoration: none;
+ &:hover { color: var(--accent-bright); }
+ }
+ &__sep { color: var(--text-ghost); }
+ &__cur { color: var(--text); }
+ }
+
+ .sk-topbar__actions {
+ margin-left: auto;
+ flex-wrap: wrap;
+ justify-content: flex-end;
+ row-gap: 6px;
+ }
}
+
+ // Centered max-width column below the full-bleed top bar, same as WordPress
+ // and service detail pages.
+ .app-detail-body {
+ display: flex;
+ flex-direction: column;
+ gap: $space-5;
+ width: 100%;
+ max-width: 1200px;
+ margin-inline: auto;
+ padding: $space-6 $space-6 $space-10;
+ }
+
+ // Identity row — flat on the page, no card background.
+ .app-detail-header {
+ gap: $space-4;
+ padding: 4px 0 0;
+ background: none;
+ border: none;
+ border-radius: 0;
+ }
+
+ .ws-detail__tile { border-radius: 14px; }
+
+ .ws-detail__desc {
+ margin: 0;
+ font-size: 13px;
+ line-height: 1.55;
+ color: var(--text-dim);
+ max-width: 720px;
+ }
+
+ // Tabs wrap instead of scroll so the right-pinned Settings tab is reachable.
+ .app-detail-tabs {
+ flex-wrap: wrap;
+ overflow-x: visible;
+ row-gap: 2px;
+ }
+
+ // Settings tab pinned to the far right of the tab strip.
+ .app-detail-tab--end { margin-left: auto; }
}
// Brand-color picker in the workspace create modal (#33). Top-level so it also
@@ -490,3 +621,97 @@
}
}
}
+
+// Workspace settings page — left sub-nav + content, matching WordPress/service detail.
+.ws-settings {
+ display: grid;
+ grid-template-columns: 200px 1fr;
+ gap: $space-4;
+ align-items: start;
+
+ @media (max-width: $breakpoint-md) {
+ grid-template-columns: 1fr;
+ }
+
+ &__nav {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+ position: sticky;
+ top: $space-4;
+
+ @media (max-width: $breakpoint-md) {
+ position: static;
+ }
+ }
+
+ &__group + &__group { margin-top: $space-4; }
+
+ &__grouplabel {
+ padding: 0 12px;
+ margin-bottom: 6px;
+ font-family: var(--mono);
+ font-size: 10px;
+ font-weight: $font-weight-semibold;
+ letter-spacing: 0.08em;
+ text-transform: uppercase;
+ color: var(--text-faint);
+ }
+
+ &__navitem {
+ display: flex;
+ width: 100%;
+ align-items: center;
+ gap: 9px;
+ padding: 9px 12px;
+ border: none;
+ border-radius: 8px;
+ background: transparent;
+ color: var(--text-dim);
+ font-size: 13px;
+ cursor: pointer;
+ transition: background-color 0.14s, color 0.14s;
+
+ &:hover {
+ background: var(--surface-hover);
+ color: var(--text);
+ }
+
+ &.is-active {
+ background: var(--accent-bg);
+ color: var(--accent-bright);
+ font-weight: $font-weight-medium;
+ }
+ }
+
+ &__content {
+ min-width: 0;
+ display: flex;
+ flex-direction: column;
+ gap: $space-4;
+ }
+
+ &__section-title {
+ margin: 0 0 $space-3;
+ font-size: 15px;
+ font-weight: $font-weight-semibold;
+ color: var(--text);
+ }
+
+ &__actions {
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ gap: $space-2;
+ margin-top: $space-2;
+ }
+
+ &__management {
+ .ws-settings__actions-grid {
+ display: flex;
+ flex-wrap: wrap;
+ gap: $space-3;
+ align-items: center;
+ }
+ }
+}