From 11142c1d08b5766ad76efff469fe2719e6056a34 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Sun, 17 May 2026 21:18:38 +0200 Subject: [PATCH] feat(server-detail): state cluster + inspection strip + five modals Co-Authored-By: Claude Sonnet 4.6 --- l4d2web/l4d2web/templates/server_detail.html | 201 ++++++++++++++----- l4d2web/tests/test_servers.py | 41 ++++ 2 files changed, 193 insertions(+), 49 deletions(-) diff --git a/l4d2web/l4d2web/templates/server_detail.html b/l4d2web/l4d2web/templates/server_detail.html index 53fb085..c567a65 100644 --- a/l4d2web/l4d2web/templates/server_detail.html +++ b/l4d2web/l4d2web/templates/server_detail.html @@ -1,46 +1,70 @@ {% extends "base.html" %} +{% import "_macros.html" as macros %} {% block title %}Server {{ server.name }} | left4me{% endblock %} {% block content %} -
+

Server: {{ server.name }}

-
- -
Blueprint
{% if blueprint %}{{ blueprint.name }}{% endif %}
-
RCON Password
••••••••••••
-
Hostname
-
-
- - - - Leave empty for auto: "{{ g.user.username }} {{ server.name }}" -
-
-
-
- -

Actions

+ {# Lifecycle subblock — uses _server_actions.html which now opens job-log-modal on click #} {% include "_server_actions.html" %} -

Server Log

- 

-
-  

-  

+           hx-swap="innerHTML">

 
-  
Console

-  

-    

+  {# Config grid — flat auto-fit; uses config_field macro from _macros.html #}
+  

+    {{ macros.config_field(
+        "Port",
+        ('' ~ server.port ~ '') | safe
+    ) }}
+    {{ macros.config_field(
+        "Blueprint",
+        (('' ~ blueprint.name ~ '') | safe) if blueprint else "—"
+    ) }}
+    {{ macros.config_field(
+        "RCON",
+        (
+          '••••••••••••'
+          ~ ' '
+          ~ ''
+        ) | safe
+    ) }}
+    {{ macros.config_field(
+        "Hostname",
+        (
+          '
'
+          ~ ''
+          ~ ''
+          ~ ''
+          ~ '
'
+        ) | safe,
+        editable=True
+    ) }}
+  

+

+
+{# Inspection strip — Log / Console / Files with expand-to-modal #}
+

+  

+    
+    
+    
+    
+  

+
+  

+    

+  

+
+  

+  
 
-  
Files

-  {% if not file_tree_root_entries %}
-    
No files yet — start the server to mount its runtime.

-  {% else %}
-    {% set entries = file_tree_root_entries %}
-    {% set truncated = file_tree_truncated %}
-    {% set truncated_count = file_tree_truncated_count %}
-    {% set files_base_url = "/servers/" ~ server.id %}
-    {% include "_overlay_file_tree.html" %}
-  {% endif %}
+  
 

 
 

@@ -85,6 +103,91 @@
   Rename
 

 
+{# ===== Modals ===== #}
+
+
+  

+    
Server log

+    
+  

+  

+    

+  

+
+
+
+  

+    
Console

+    
+  

+  

+    

+      {% for h in console_history %}
+        {% with command=h.command, reply=h.reply, is_error=h.is_error %}
+          {% include "_console_line.html" %}
+        {% endwith %}
+      {% endfor %}
+    

+    

+      
+      >
+      
+      
+    

+  

+
+
+
+  

+    
Files

+    
+  

+  

+    {% if file_tree_root_entries %}
+      {% set entries = file_tree_root_entries %}
+      {% set truncated = file_tree_truncated %}
+      {% set truncated_count = file_tree_truncated_count %}
+      {% set files_base_url = "/servers/" ~ server.id %}
+      {% include "_overlay_file_tree.html" %}
+    {% else %}
+      
No files yet — start the server to mount its runtime.

+    {% endif %}
+  

+
+
+
+  

+    
Recent players

+    
+  

+  

+    {# Re-renders via HTMX when modal first becomes visible (Task 8b adds the ?view=recent-modal branch). #}
+    

+  

+
+
+
+  

+    
Job log

+    
+  

+  

+    {% if latest_job %}
+      

+      
open full job →

+    {% else %}
+      
No job has run for this server yet.

+    {% endif %}
+  

+
+
 
   

     
Rename server

diff --git a/l4d2web/tests/test_servers.py b/l4d2web/tests/test_servers.py
index 1434557..a7551cb 100644
--- a/l4d2web/tests/test_servers.py
+++ b/l4d2web/tests/test_servers.py
@@ -750,3 +750,44 @@ def test_update_server_clears_hostname(user_client_with_blueprints) -> None:
         server = session.scalar(select(Server).where(Server.name == "alpha"))
         assert server is not None
         assert server.hostname == ""
+
+
+def test_server_detail_renders_state_cluster_and_inspection_strip(user_client_with_blueprints) -> None:
+    from sqlalchemy import select
+
+    from l4d2web.models import Server
+
+    client, data = user_client_with_blueprints
+
+    with session_scope() as db:
+        server = Server(
+            user_id=data["user_id"],
+            blueprint_id=data["blueprint_id"],
+            name="redesign",
+            port=27098,
+            rcon_password="x",
+            actual_state="stopped",
+        )
+        db.add(server)
+        db.flush()
+        server_id = server.id
+
+    res = client.get(f"/servers/{server_id}")
+    assert res.status_code == 200
+    html = res.get_data(as_text=True)
+
+    # State-cluster panel (CSS class order may vary)
+    assert 'class="panel state-cluster"' in html or 'class="state-cluster panel"' in html
+
+    # Inspection strip
+    assert "data-tab-strip" in html
+    assert 'data-tab="log"' in html
+    assert 'data-tab="console"' in html
+    assert 'data-tab="files"' in html
+
+    # Five new modals
+    assert 'id="log-modal"' in html
+    assert 'id="console-modal"' in html
+    assert 'id="files-modal"' in html
+    assert 'id="recent-players-modal"' in html
+    assert 'id="job-log-modal"' in html