feat(l4d2-web): add server creation form
This commit is contained in:
parent
bbfc528354
commit
ee144fad96
5 changed files with 51 additions and 3 deletions
|
|
@ -67,7 +67,10 @@ def servers_page() -> str:
|
||||||
.where(Server.user_id == user.id)
|
.where(Server.user_id == user.id)
|
||||||
.order_by(Server.name)
|
.order_by(Server.name)
|
||||||
).all()
|
).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/<int:server_id>")
|
@bp.get("/servers/<int:server_id>")
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,8 @@ bp = Blueprint("server", __name__)
|
||||||
def create_server() -> Response:
|
def create_server() -> Response:
|
||||||
user = current_user()
|
user = current_user()
|
||||||
assert user is not None
|
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:
|
with session_scope() as db:
|
||||||
blueprint = db.scalar(
|
blueprint = db.scalar(
|
||||||
|
|
@ -40,7 +41,9 @@ def create_server() -> Response:
|
||||||
db.flush()
|
db.flush()
|
||||||
server_id = server.id
|
server_id = server.id
|
||||||
|
|
||||||
|
if json_response:
|
||||||
return jsonify({"id": server_id}), 201
|
return jsonify({"id": server_id}), 201
|
||||||
|
return redirect(f"/servers/{server_id}")
|
||||||
|
|
||||||
|
|
||||||
@bp.patch("/servers/<int:server_id>")
|
@bp.patch("/servers/<int:server_id>")
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,23 @@
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<section class="panel">
|
<section class="panel">
|
||||||
<h1>Servers</h1>
|
<h1>Servers</h1>
|
||||||
|
{% if blueprints %}
|
||||||
|
<form method="post" action="/servers" class="stack form-panel">
|
||||||
|
<input type="hidden" name="csrf_token" value="{{ session.get('csrf_token', '') }}">
|
||||||
|
<label>Name <input name="name" required></label>
|
||||||
|
<label>Port <input name="port" type="number" min="1" max="65535" value="27015" required></label>
|
||||||
|
<label>Blueprint
|
||||||
|
<select name="blueprint_id" required>
|
||||||
|
{% for blueprint in blueprints %}
|
||||||
|
<option value="{{ blueprint.id }}">{{ blueprint.name }}</option>
|
||||||
|
{% endfor %}
|
||||||
|
</select>
|
||||||
|
</label>
|
||||||
|
<button type="submit">Create server</button>
|
||||||
|
</form>
|
||||||
|
{% else %}
|
||||||
|
<p class="muted">Create a blueprint before adding servers.</p>
|
||||||
|
{% endif %}
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead><tr><th>Name</th><th>Port</th><th>Blueprint</th><th>Desired</th><th>Actual</th></tr></thead>
|
<thead><tr><th>Name</th><th>Port</th><th>Blueprint</th><th>Desired</th><th>Actual</th></tr></thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
|
|
||||||
|
|
@ -272,6 +272,19 @@ def test_servers_page_links_server_names(auth_client_with_server) -> None:
|
||||||
assert ">details<" not in text
|
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 '<option value="1">default</option>' in text
|
||||||
|
assert "Create server" in text
|
||||||
|
|
||||||
|
|
||||||
def test_non_admin_does_not_see_admin_nav(auth_client_with_server) -> None:
|
def test_non_admin_does_not_see_admin_nav(auth_client_with_server) -> None:
|
||||||
response = auth_client_with_server.get("/dashboard")
|
response = auth_client_with_server.get("/dashboard")
|
||||||
text = response.get_data(as_text=True)
|
text = response.get_data(as_text=True)
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,18 @@ def test_create_server_from_blueprint(user_client_with_blueprints) -> None:
|
||||||
assert response.status_code == 201
|
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:
|
def test_reassign_blueprint_anytime(user_client_with_blueprints) -> None:
|
||||||
client, data = user_client_with_blueprints
|
client, data = user_client_with_blueprints
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue