ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
feat(activity): audit feed filters by target_id
Juan Denisede0f0fdbd72
diff --git a/backend/app/api/admin.py b/backend/app/api/admin.pyindex 5dd93175..1786f2e0 100644--- a/backend/app/api/admin.py+++ b/backend/app/api/admin.py@@ -690,6 +690,8 @@ def get_activity_feed():per_page = min(request.args.get('per_page', 50, type=int), 100)user_id = request.args.get('user_id', type=int)action = request.args.get('action')+ target_type = request.args.get('target_type')+ target_id = request.args.get('target_id', type=int)start_date = request.args.get('start_date')end_date = request.args.get('end_date')@@ -698,6 +700,8 @@ def get_activity_feed():'per_page': per_page,'user_id': user_id,'action': action,+ 'target_type': target_type,+ 'target_id': target_id,}if start_date:diff --git a/backend/app/services/audit_service.py b/backend/app/services/audit_service.pyindex 414750d4..36e976c2 100644--- a/backend/app/services/audit_service.py+++ b/backend/app/services/audit_service.py@@ -151,7 +151,7 @@ class AuditService:@staticmethoddef get_logs(page=1, per_page=50, action=None, user_id=None,- target_type=None, start_date=None, end_date=None):+ target_type=None, target_id=None, start_date=None, end_date=None):"""Query audit logs with filtering and pagination.@@ -161,6 +161,7 @@ class AuditService:action: Filter by action typeuser_id: Filter by user who performed actiontarget_type: Filter by target type+ target_id: Filter by target id (paired with target_type)start_date: Filter logs after this dateend_date: Filter logs before this date@@ -175,6 +176,8 @@ class AuditService:query = query.filter(AuditLog.user_id == user_id)if target_type:query = query.filter(AuditLog.target_type == target_type)+ if target_id:+ query = query.filter(AuditLog.target_id == target_id)if start_date:query = query.filter(AuditLog.created_at >= start_date)if end_date:diff --git a/backend/tests/test_audit_log.py b/backend/tests/test_audit_log.pyindex 28c6fb96..687d0a33 100644--- a/backend/tests/test_audit_log.py+++ b/backend/tests/test_audit_log.py@@ -160,3 +160,25 @@ def test_explicit_audit_log_suppresses_fallback(app, client):log = AuditLog.query.filter_by(action=AuditLog.ACTION_RESOURCE_CREATE).one()assert log.target_type == 'explicit_resource'assert log.target_id == 7+++def test_get_logs_filters_by_target_id(app):+ from app.services.audit_service import AuditService++ with app.app_context():+ for target_id in (1, 1, 2):+ AuditService.log(+ action=AuditLog.ACTION_RESOURCE_UPDATE,+ user_id=None,+ target_type='app',+ target_id=target_id,+ details={'name': f'app-{target_id}'},+ )++ page = AuditService.get_logs(target_type='app', target_id=1)+ assert page.total == 2+ assert all(log.target_id == 1 for log in page.items)++ # target_type alone still works; an absent target matches nothing+ assert AuditService.get_logs(target_type='app').total == 3+ assert AuditService.get_logs(target_type='app', target_id=99).total == 0diff --git a/frontend/src/services/api/auth.js b/frontend/src/services/api/auth.jsindex 4941c7cd..dfda95fe 100644--- a/frontend/src/services/api/auth.js+++ b/frontend/src/services/api/auth.js@@ -184,6 +184,8 @@ export async function getActivityFeed(params = {}) {if (params.per_page) searchParams.append('per_page', params.per_page);if (params.user_id) searchParams.append('user_id', params.user_id);if (params.action) searchParams.append('action', params.action);+ if (params.target_type) searchParams.append('target_type', params.target_type);+ if (params.target_id) searchParams.append('target_id', params.target_id);if (params.start_date) searchParams.append('start_date', params.start_date);if (params.end_date) searchParams.append('end_date', params.end_date);const query = searchParams.toString();