diff --git a/l4d2web/routes/page_routes.py b/l4d2web/routes/page_routes.py index 5e29e7c..590074d 100644 --- a/l4d2web/routes/page_routes.py +++ b/l4d2web/routes/page_routes.py @@ -67,7 +67,10 @@ def servers_page() -> str: .where(Server.user_id == user.id) .order_by(Server.name) ).all() - return render_template("servers.html", rows=rows) + blueprints = db.scalars( + select(BlueprintModel).where(BlueprintModel.user_id == user.id).order_by(BlueprintModel.name) + ).all() + return render_template("servers.html", rows=rows, blueprints=blueprints) @bp.get("/servers/") diff --git a/l4d2web/routes/server_routes.py b/l4d2web/routes/server_routes.py index 78636b0..89e6e33 100644 --- a/l4d2web/routes/server_routes.py +++ b/l4d2web/routes/server_routes.py @@ -15,7 +15,8 @@ bp = Blueprint("server", __name__) def create_server() -> Response: user = current_user() assert user is not None - payload = request.get_json(silent=True) or {} + json_response = request.is_json + payload = request.get_json(silent=True) if json_response else request.form with session_scope() as db: blueprint = db.scalar( @@ -40,7 +41,9 @@ def create_server() -> Response: db.flush() server_id = server.id - return jsonify({"id": server_id}), 201 + if json_response: + return jsonify({"id": server_id}), 201 + return redirect(f"/servers/{server_id}") @bp.patch("/servers/") diff --git a/l4d2web/templates/servers.html b/l4d2web/templates/servers.html index 900da6a..54f4c95 100644 --- a/l4d2web/templates/servers.html +++ b/l4d2web/templates/servers.html @@ -5,6 +5,23 @@ {% block content %}

Servers

+ {% if blueprints %} +
+ + + + + +
+ {% else %} +

Create a blueprint before adding servers.

+ {% endif %} diff --git a/l4d2web/tests/test_pages.py b/l4d2web/tests/test_pages.py index 66068b4..82f7a3e 100644 --- a/l4d2web/tests/test_pages.py +++ b/l4d2web/tests/test_pages.py @@ -272,6 +272,19 @@ def test_servers_page_links_server_names(auth_client_with_server) -> None: assert ">details<" not in text +def test_servers_page_has_creation_form(auth_client_with_server) -> None: + response = auth_client_with_server.get("/servers") + text = response.get_data(as_text=True) + + assert response.status_code == 200 + assert 'method="post" action="/servers"' in text + assert 'name="name"' in text + assert 'name="port"' in text + assert 'name="blueprint_id"' in text + assert '' in text + assert "Create server" in text + + def test_non_admin_does_not_see_admin_nav(auth_client_with_server) -> None: response = auth_client_with_server.get("/dashboard") text = response.get_data(as_text=True) diff --git a/l4d2web/tests/test_servers.py b/l4d2web/tests/test_servers.py index 6b52e52..5f1f5eb 100644 --- a/l4d2web/tests/test_servers.py +++ b/l4d2web/tests/test_servers.py @@ -49,6 +49,18 @@ def test_create_server_from_blueprint(user_client_with_blueprints) -> None: assert response.status_code == 201 +def test_create_server_from_form_redirects_to_server(user_client_with_blueprints) -> None: + client, data = user_client_with_blueprints + response = client.post( + "/servers", + data={"name": "alpha", "port": "27015", "blueprint_id": str(data["blueprint_id"])}, + headers={"X-CSRF-Token": "test-token"}, + ) + + assert response.status_code == 302 + assert response.headers["Location"].endswith("/servers/1") + + def test_reassign_blueprint_anytime(user_client_with_blueprints) -> None: client, data = user_client_with_blueprints
NamePortBlueprintDesiredActual