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
Add metric filter toggles and improve validation UX
Juan Denis85831b9b5453
diff --git a/backend/app/api/templates.py b/backend/app/api/templates.pyindex 76befc0b..2bb8cc20 100644--- a/backend/app/api/templates.py+++ b/backend/app/api/templates.py@@ -172,53 +172,66 @@ def install_template(template_id):@jwt_required()def validate_installation():"""Validate template installation parameters before installing."""- data = request.get_json()-- if not data:- return jsonify({'error': 'No data provided'}), 400+ try:+ data = request.get_json()- template_id = data.get('template_id')- app_name = data.get('app_name')- user_variables = data.get('variables', {})+ if not data:+ return jsonify({'error': 'No data provided'}), 400- errors = []+ template_id = data.get('template_id')+ app_name = data.get('app_name')+ user_variables = data.get('variables', {})- # Validate app name- import re- if not app_name:- errors.append('App name is required')- elif not re.match(r'^[a-z0-9][a-z0-9-]*[a-z0-9]$', app_name) or len(app_name) < 3:- errors.append('App name must be lowercase alphanumeric with hyphens, at least 3 characters')+ errors = []- # Check if app name is taken- existing = Application.query.filter_by(name=app_name).first()- if existing:- errors.append(f'An application named "{app_name}" already exists')+ # Validate app name+ import re+ if not app_name:+ errors.append('App name is required')+ elif len(app_name) < 2:+ errors.append('App name must be at least 2 characters')+ elif not re.match(r'^[a-z0-9]([a-z0-9-]*[a-z0-9])?$', app_name):+ errors.append('App name must be lowercase alphanumeric with optional hyphens (not at start/end)')++ # Check if app name is taken+ if app_name:+ existing = Application.query.filter_by(name=app_name).first()+ if existing:+ errors.append(f'An application named "{app_name}" already exists')++ # Validate template exists and check required variables+ if template_id:+ result = TemplateService.get_template(template_id)+ if not result.get('success'):+ errors.append('Template not found')+ else:+ template = result['template']+ raw_vars = template.get('variables', [])++ # Handle both list and dict formats+ if isinstance(raw_vars, list):+ for var in raw_vars:+ if isinstance(var, dict) and var.get('required', False):+ var_name = var.get('name', '')+ if var_name and var_name not in user_variables:+ errors.append(f'Required variable "{var_name}" is not provided')+ elif isinstance(raw_vars, dict):+ for var_name, var_config in raw_vars.items():+ if var_config.get('required', False) and var_name not in user_variables:+ errors.append(f'Required variable "{var_name}" is not provided')+ else:+ errors.append('Template ID is required')++ if errors:+ return jsonify({'valid': False, 'errors': errors}), 400++ return jsonify({'valid': True}), 200- # Validate template exists and check required variables- result = TemplateService.get_template(template_id)- if not result.get('success'):- errors.append('Template not found')- else:- template = result['template']- raw_vars = template.get('variables', [])-- # Handle both list and dict formats- if isinstance(raw_vars, list):- for var in raw_vars:- if isinstance(var, dict) and var.get('required', False):- var_name = var.get('name', '')- if var_name and var_name not in user_variables:- errors.append(f'Required variable "{var_name}" is not provided')- elif isinstance(raw_vars, dict):- for var_name, var_config in raw_vars.items():- if var_config.get('required', False) and var_name not in user_variables:- errors.append(f'Required variable "{var_name}" is not provided')-- if errors:- return jsonify({'valid': False, 'errors': errors}), 400-- return jsonify({'valid': True}), 200+ except Exception as e:+ import traceback+ error_trace = traceback.format_exc()+ print(f"Validate install error: {error_trace}")+ return jsonify({'error': str(e), 'trace': error_trace}), 500@templates_bp.route('/test-db-connection', methods=['POST'])diff --git a/frontend/dist/index.html b/frontend/dist/index.htmlindex 25c4a44b..f2297b64 100644--- a/frontend/dist/index.html+++ b/frontend/dist/index.html@@ -6,8 +6,8 @@<link rel="icon" type="image/svg+xml" href="/vite.svg" /><meta name="viewport" content="width=device-width, initial-scale=1.0" /><title>React Dashboard Template</title>- <script type="module" crossorigin src="/assets/index-DYaRythr.js"></script>- <link rel="stylesheet" crossorigin href="/assets/index-W4e3hCos.css">+ <script type="module" crossorigin src="/assets/index-wLsYZs2i.js"></script>+ <link rel="stylesheet" crossorigin href="/assets/index-D-CG0J1N.css"></head><body>diff --git a/frontend/src/components/MetricsGraph.jsx b/frontend/src/components/MetricsGraph.jsxindex f98d48b6..8cb0be5f 100644--- a/frontend/src/components/MetricsGraph.jsx+++ b/frontend/src/components/MetricsGraph.jsx@@ -1,9 +1,9 @@import React, { useState, useEffect } from 'react';import {- LineChart, Line, XAxis, YAxis, CartesianGrid,- Tooltip, ResponsiveContainer, Area, AreaChart, Legend+ XAxis, YAxis, CartesianGrid,+ Tooltip, ResponsiveContainer, Area, AreaChart} from 'recharts';-import { Cpu, MemoryStick, HardDrive, Clock, TrendingUp } from 'lucide-react';+import { Cpu, MemoryStick, HardDrive, TrendingUp } from 'lucide-react';import api from '../services/api';// Chart colors - using actual hex values for SVG compatibility@@ -18,9 +18,21 @@ const MetricsGraph = ({ compact = false }) => {const [period, setPeriod] = useState('1h');const [loading, setLoading] = useState(true);const [error, setError] = useState(null);+ const [visibleMetrics, setVisibleMetrics] = useState({+ cpu: true,+ memory: true,+ disk: true+ });const periods = ['1h', '6h', '24h', '7d', '30d'];+ const toggleMetric = (metric) => {+ setVisibleMetrics(prev => ({+ ...prev,+ [metric]: !prev[metric]+ }));+ };+useEffect(() => {loadHistory();}, [period]);@@ -51,17 +63,6 @@ const MetricsGraph = ({ compact = false }) => {}}- function getColor(value, type) {- if (type === 'cpu') {- if (value > 80) return '#ef4444'; // danger- if (value > 60) return '#f59e0b'; // warning- return '#10b981'; // success- }- if (value > 90) return '#ef4444'; // danger- if (value > 80) return '#f59e0b'; // warning- return '#6366f1'; // accent- }-if (loading && !data) {return (<div className="metrics-graph-card loading">@@ -194,41 +195,29 @@ const MetricsGraph = ({ compact = false }) => {</div></div>- <div className="metrics-summary-row">- <div className="summary-stat">- <Cpu size={16} />- <div>- <span className="stat-label">CPU Avg</span>- <span className="stat-value" style={{ color: getColor(data.summary.cpu_avg, 'cpu') }}>- {data.summary.cpu_avg}%- </span>- </div>- </div>- <div className="summary-stat">- <MemoryStick size={16} />- <div>- <span className="stat-label">Memory Avg</span>- <span className="stat-value" style={{ color: getColor(data.summary.memory_avg, 'memory') }}>- {data.summary.memory_avg}%- </span>- </div>- </div>- <div className="summary-stat">- <HardDrive size={16} />- <div>- <span className="stat-label">Disk Avg</span>- <span className="stat-value" style={{ color: getColor(data.summary.disk_avg, 'disk') }}>- {data.summary.disk_avg}%- </span>- </div>- </div>- <div className="summary-stat">- <Clock size={16} />- <div>- <span className="stat-label">Data Points</span>- <span className="stat-value">{data.points}</span>- </div>- </div>+ {/* Clickable filter legend */}+ <div className="metrics-filter-legend">+ <button+ className={`filter-btn cpu ${visibleMetrics.cpu ? 'active' : ''}`}+ onClick={() => toggleMetric('cpu')}+ >+ <Cpu size={14} />+ <span>CPU</span>+ </button>+ <button+ className={`filter-btn memory ${visibleMetrics.memory ? 'active' : ''}`}+ onClick={() => toggleMetric('memory')}+ >+ <MemoryStick size={14} />+ <span>Memory</span>+ </button>+ <button+ className={`filter-btn disk ${visibleMetrics.disk ? 'active' : ''}`}+ onClick={() => toggleMetric('disk')}+ >+ <HardDrive size={14} />+ <span>Disk</span>+ </button></div><div className="metrics-chart-container">@@ -275,57 +264,48 @@ const MetricsGraph = ({ compact = false }) => {tickFormatter={(value) => `${value}%`}/><Tooltip content={<CustomTooltip />} />- <Area- type="monotone"- dataKey="cpu"- stroke={CHART_COLORS.cpu}- fill="url(#cpuGradient)"- strokeWidth={2.5}- dot={false}- activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.cpu, fill: '#18181b' }}- name="CPU"- filter="url(#glow)"- />- <Area- type="monotone"- dataKey="memory"- stroke={CHART_COLORS.memory}- fill="url(#memoryGradient)"- strokeWidth={2.5}- dot={false}- activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.memory, fill: '#18181b' }}- name="Memory"- filter="url(#glow)"- />- <Area- type="monotone"- dataKey="disk"- stroke={CHART_COLORS.disk}- fill="url(#diskGradient)"- strokeWidth={2.5}- dot={false}- activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.disk, fill: '#18181b' }}- name="Disk"- filter="url(#glow)"- />+ {visibleMetrics.cpu && (+ <Area+ type="monotone"+ dataKey="cpu"+ stroke={CHART_COLORS.cpu}+ fill="url(#cpuGradient)"+ strokeWidth={2.5}+ dot={false}+ activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.cpu, fill: '#18181b' }}+ name="CPU"+ filter="url(#glow)"+ />+ )}+ {visibleMetrics.memory && (+ <Area+ type="monotone"+ dataKey="memory"+ stroke={CHART_COLORS.memory}+ fill="url(#memoryGradient)"+ strokeWidth={2.5}+ dot={false}+ activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.memory, fill: '#18181b' }}+ name="Memory"+ filter="url(#glow)"+ />+ )}+ {visibleMetrics.disk && (+ <Area+ type="monotone"+ dataKey="disk"+ stroke={CHART_COLORS.disk}+ fill="url(#diskGradient)"+ strokeWidth={2.5}+ dot={false}+ activeDot={{ r: 6, strokeWidth: 2, stroke: CHART_COLORS.disk, fill: '#18181b' }}+ name="Disk"+ filter="url(#glow)"+ />+ )}</AreaChart></ResponsiveContainer></div>-- <div className="metrics-legend">- <div className="legend-item">- <span className="legend-line cpu" />- <span>CPU</span>- </div>- <div className="legend-item">- <span className="legend-line memory" />- <span>Memory</span>- </div>- <div className="legend-item">- <span className="legend-line disk" />- <span>Disk</span>- </div>- </div></div>);};diff --git a/frontend/src/components/workflow/WorkflowListModal.jsx b/frontend/src/components/workflow/WorkflowListModal.jsxindex 85339d10..7a4e69f1 100644--- a/frontend/src/components/workflow/WorkflowListModal.jsx+++ b/frontend/src/components/workflow/WorkflowListModal.jsx@@ -43,12 +43,18 @@ const WorkflowListModal = ({ onLoad, onClose }) => {};const handleLoad = async (workflow) => {+ setError(null);try {const response = await api.getWorkflow(workflow.id);- onLoad(response);+ if (response && response.nodes !== undefined) {+ onLoad(response);+ } else {+ console.error('Invalid workflow response:', response);+ setError('Invalid workflow data received');+ }} catch (err) {console.error('Failed to load workflow:', err);- setError('Failed to load workflow');+ setError(err.message || 'Failed to load workflow');}};diff --git a/frontend/src/pages/Templates.jsx b/frontend/src/pages/Templates.jsxindex cdbc58a5..44427d13 100644--- a/frontend/src/pages/Templates.jsx+++ b/frontend/src/pages/Templates.jsx@@ -640,13 +640,12 @@ const InstallModal = ({ template, onClose, onSuccess }) => {<inputtype="text"value={appName}- onChange={(e) => setAppName(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, '-'))}+ onChange={(e) => setAppName(e.target.value.toLowerCase().replace(/[^a-z0-9-]/g, ''))}placeholder="my-app"- pattern="[a-z0-9][a-z0-9-]*[a-z0-9]"- minLength={3}+ minLength={2}required/>- <span className="form-help">Lowercase letters, numbers, and hyphens only</span>+ <span className="form-help">Lowercase letters, numbers, and hyphens only (min 2 chars)</span></div>{(template.variables || []).filter(v => !v.hidden).length > 0 && (diff --git a/frontend/src/pages/WorkflowBuilder.jsx b/frontend/src/pages/WorkflowBuilder.jsxindex 19200fbc..ae3d0149 100644--- a/frontend/src/pages/WorkflowBuilder.jsx+++ b/frontend/src/pages/WorkflowBuilder.jsx@@ -201,7 +201,14 @@ const WorkflowCanvas = () => {}, [nodes, edges, workflowName, currentWorkflow, getViewport]);// Load workflow- const loadWorkflow = useCallback(async (workflow) => {+ const loadWorkflow = useCallback((workflow) => {+ if (!workflow) {+ console.error('No workflow provided to load');+ setSaveMessage('No workflow data');+ setTimeout(() => setSaveMessage(null), 3000);+ return;+ }+setIsLoading(true);setShowLoadModal(false);@@ -216,7 +223,7 @@ const WorkflowCanvas = () => {const loadedEdges = (workflow.edges || []).map((edge) => ({...edge,data: {- ...edge.data,+ ...(edge.data || {}),onDelete: deleteEdge}}));@@ -230,7 +237,7 @@ const WorkflowCanvas = () => {setNodes(loadedNodes);setEdges(loadedEdges);- setWorkflowName(workflow.name);+ setWorkflowName(workflow.name || 'Untitled Workflow');setCurrentWorkflow(workflow);// Restore viewport@@ -240,7 +247,7 @@ const WorkflowCanvas = () => {}, 50);}- setSaveMessage('Workflow loaded');+ setSaveMessage(`Loaded: ${workflow.name}`);setTimeout(() => setSaveMessage(null), 3000);} catch (error) {console.error('Failed to load workflow:', error);@@ -685,13 +692,7 @@ const WorkflowCanvas = () => {const WorkflowBuilder = () => {return (- <div className="workflow-page">- <div className="page-header">- <h1>Workflow Builder</h1>- <p className="page-subtitle">- Visual orchestration for your infrastructure- </p>- </div>+ <div className="workflow-page fullscreen"><ReactFlowProvider><WorkflowCanvas /></ReactFlowProvider>diff --git a/frontend/src/styles/components/_metrics-graph.less b/frontend/src/styles/components/_metrics-graph.lessindex b0b1153f..ec040643 100644--- a/frontend/src/styles/components/_metrics-graph.less+++ b/frontend/src/styles/components/_metrics-graph.less@@ -168,7 +168,80 @@}}-// Legend+// Filter Legend (clickable)+.metrics-filter-legend {+ display: flex;+ align-items: center;+ justify-content: center;+ gap: @space-3;+ margin-bottom: @space-4;+}++.filter-btn {+ display: flex;+ align-items: center;+ gap: @space-2;+ padding: @space-2 @space-4;+ border-radius: @radius-full;+ border: 1px solid @border-subtle;+ background: transparent;+ color: @text-tertiary;+ font-size: @font-size-sm;+ font-weight: @font-weight-medium;+ cursor: pointer;+ transition: all @transition-fast;+ opacity: 0.5;++ svg {+ opacity: 0.7;+ }++ &:hover {+ background: @bg-hover;+ border-color: @border-active;+ }++ &.active {+ opacity: 1;+ color: @text-primary;++ svg {+ opacity: 1;+ }+ }++ &.cpu.active {+ background: rgba(16, 185, 129, 0.15);+ border-color: rgba(16, 185, 129, 0.4);+ color: #10b981;++ &:hover {+ background: rgba(16, 185, 129, 0.25);+ }+ }++ &.memory.active {+ background: rgba(99, 102, 241, 0.15);+ border-color: rgba(99, 102, 241, 0.4);+ color: #6366f1;++ &:hover {+ background: rgba(99, 102, 241, 0.25);+ }+ }++ &.disk.active {+ background: rgba(245, 158, 11, 0.15);+ border-color: rgba(245, 158, 11, 0.4);+ color: #f59e0b;++ &:hover {+ background: rgba(245, 158, 11, 0.25);+ }+ }+}++// Legacy Legend (static, kept for compact view).metrics-legend {display: flex;align-items: center;diff --git a/frontend/src/styles/pages/_workflow.less b/frontend/src/styles/pages/_workflow.lessindex 8f3a6206..45995216 100644--- a/frontend/src/styles/pages/_workflow.less+++ b/frontend/src/styles/pages/_workflow.less@@ -8,6 +8,16 @@height: calc(100vh - @space-6);padding: @space-4;+ &.fullscreen {+ height: 100vh;+ padding: 0;++ .workflow-canvas {+ border-radius: 0;+ border: none;+ }+ }+.page-header {flex-shrink: 0;margin-bottom: @space-4;@@ -200,73 +210,6 @@right: -6px !important;}-// ============================================-// TOOLBAR STYLES-// ============================================--.workflow-toolbar {- position: absolute;- top: @space-4;- left: @space-4;- z-index: 10;- display: flex;- flex-direction: column;- gap: @space-2;- background: @bg-card;- border: 1px solid @border-subtle;- border-radius: @radius-lg;- padding: @space-2;- box-shadow: @shadow-lg;-}--.workflow-toolbar-btn {- display: flex;- align-items: center;- gap: @space-2;- padding: @space-2 @space-3;- background: transparent;- border: 1px solid transparent;- border-radius: @radius-md;- color: @text-secondary;- font-size: @font-size-sm;- font-weight: @font-weight-medium;- cursor: pointer;- transition: all @transition-fast;- white-space: nowrap;-- svg {- flex-shrink: 0;- }-- &:hover {- background: @bg-hover;- color: @text-primary;- }-- &.toolbar-btn-docker:hover {- background: fade(#2496ed, 15%);- color: #2496ed;- border-color: fade(#2496ed, 30%);- }-- &.toolbar-btn-database:hover {- background: fade(@warning, 15%);- color: @warning;- border-color: fade(@warning, 30%);- }-- &.toolbar-btn-domain:hover {- background: fade(@success, 15%);- color: @success;- border-color: fade(@success, 30%);- }-}--.workflow-toolbar-divider {- height: 1px;- background: @border-subtle;- margin: @space-1 0;-}// ============================================// EDGE STYLES@@ -317,7 +260,7 @@border-radius: @radius-lg;padding: @space-2;box-shadow: @shadow-lg;- max-height: calc(100% - @space-8);+ max-height: calc(100% - 120px);overflow-y: auto;}