admin ui fixes

Signed-off-by: Shoumi <[email protected]>

Author: shoummu1

mcpgateway/alembic/versions/k5e6f7g8h9i0_add_structured_logging_tables.py

@@ -10,7 +10,7 @@
 
 # revision identifiers, used by Alembic.
 revision = 'k5e6f7g8h9i0'
-down_revision = 'f3a3a3d901b8'
+down_revision = ('f3a3a3d901b8', '191a2def08d7')
 branch_labels = None
 depends_on = None
 
@@ -155,7 +155,8 @@ def upgrade() -> None:
         sa.Column('id', sa.String(36), nullable=False),
         sa.Column('timestamp', sa.DateTime(timezone=True), nullable=False),
         sa.Column('correlation_id', sa.String(64), nullable=True),
-        sa.Column('action', sa.String(50), nullable=False),
+        sa.Column('request_id', sa.String(64), nullable=True),
+        sa.Column('action', sa.String(100), nullable=False),
         sa.Column('resource_type', sa.String(100), nullable=False),
         sa.Column('resource_id', sa.String(255), nullable=False),
         sa.Column('resource_name', sa.String(500), nullable=True),
@@ -180,6 +181,7 @@ def upgrade() -> None:
     # Create indexes for audit_trails
     op.create_index('ix_audit_trails_timestamp', 'audit_trails', ['timestamp'], unique=False)
     op.create_index('ix_audit_trails_correlation_id', 'audit_trails', ['correlation_id'], unique=False)
+    op.create_index('ix_audit_trails_request_id', 'audit_trails', ['request_id'], unique=False)
     op.create_index('ix_audit_trails_action', 'audit_trails', ['action'], unique=False)
     op.create_index('ix_audit_trails_resource_type', 'audit_trails', ['resource_type'], unique=False)
     op.create_index('ix_audit_trails_resource_id', 'audit_trails', ['resource_id'], unique=False)

mcpgateway/routers/log_search.py

@@ -225,10 +225,13 @@ class AuditTrailResponse(BaseModel):
     """Audit trail response model."""
     id: str
     timestamp: datetime
+    correlation_id: Optional[str] = None
     action: str
     resource_type: str
     resource_id: Optional[str]
+    resource_name: Optional[str] = None
     user_id: str
+    user_email: Optional[str] = None
     success: bool
     requires_review: bool
     data_classification: Optional[str]
@@ -629,10 +632,13 @@ async def get_audit_trails(
             AuditTrailResponse(
                 id=str(trail.id),
                 timestamp=trail.timestamp,
+                correlation_id=trail.correlation_id,
                 action=trail.action,
                 resource_type=trail.resource_type,
                 resource_id=trail.resource_id,
+                resource_name=trail.resource_name,
                 user_id=trail.user_id,
+                user_email=trail.user_email,
                 success=trail.success,
                 requires_review=trail.requires_review,
                 data_classification=trail.data_classification,

mcpgateway/static/admin.js

@@ -21603,6 +21603,7 @@ function displayCorrelationTrace(trace) {
  */
 async function showSecurityEvents() {
     setPerformanceAggregationVisibility(false);
+    setLogFiltersVisibility(false);
     try {
         const response = await fetch(`${getRootPath()}/api/logs/security-events?limit=50&resolved=false`, {
             method: 'GET',
@@ -21833,7 +21834,7 @@ function displayAuditTrail(trails) {
         const resourceName = trail.resource_name || trail.resource_id || '-';
         const resourceDisplay = `
             <div class="font-medium">${escapeHtml(resourceName)}</div>
-            ${trail.resource_id && trail.resource_name ? `<div class="text-xs text-gray-500">ID: ${escapeHtml(trail.resource_id)}</div>` : ''}
+            ${trail.resource_id && trail.resource_name ? `<div class="text-xs text-gray-500">UUID: ${escapeHtml(trail.resource_id)}</div>` : ''}
             ${trail.data_classification ? `<div class="text-xs text-orange-600 mt-1">🔒 ${escapeHtml(trail.data_classification)}</div>` : ''}
         `;
 

mcpgateway/templates/admin.html

@@ -370,7 +370,7 @@
                     class="text-gray-700 dark:text-gray-300 block px-4 py-2 text-sm hover:bg-gray-100 dark:hover:bg-gray-700"
                     role="menuitem"
                     onclick="showTab('logs')"
-                    >📋 Structured Logs</a
+                    >📋 System Logs</a
                   >
                   <a
                     href="#version-info"
@@ -579,7 +579,7 @@
               <h2
                 class="text-lg font-medium text-gray-900 dark:text-white mb-4"
               >
-                📋 Structured Logs & Analytics
+                📋 System Logs
               </h2>
 
               <!-- Quick Actions -->
@@ -630,8 +630,8 @@
                     class="px-1.5 block w-full border-gray-300 rounded-md shadow-sm dark:bg-gray-700 dark:border-gray-600 text-gray-700 dark:text-gray-300"
                     onchange="handlePerformanceAggregationChange(event)"
                   >
-                    <option value="5m">Aggregate by 5-minute windows</option>
-                    <option value="24h">Aggregate by 24-hour windows</option>
+                    <option value="5m">5 minutes</option>
+                    <option value="24h">24 hours</option>
                   </select>
                 </div>
               </div>