From f14d352657b10fc7bc67b0580089452f0d8b61e6 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Sun, 17 May 2026 00:53:26 +0200 Subject: [PATCH] revert(editor): roll back textarea code editor (re-architecture in flight) The contenteditable + CodeJar + Prism approach (Tasks 1-12 + 4 smoke fixes shipped this session) hit too many contenteditable edge cases to ship: - Copy collapses multi-line selections to one line (Selection.toString() doesn't reliably reconstruct newlines across Prism's tokenized topology). - Enter sometimes requires two presses + cursor color shifts (caret lands "between" sibling tokenized spans; first Enter shifts it into a real text node, second actually inserts). - Cascade of earlier bugs already fixed (cursor jumped to start, then end; popup-accepted-quote duplicated; popup didn't accept at end-of-line) were all symptoms of the same root cause: manual Range API manipulation against tokenized contenteditable DOM is unreliable. Exiting the sunk-cost path before more fixes accrue. The next attempt will be a fresh brainstorming session weighing CodeMirror 6 (battle- tested, accepts a one-time bundler step) vs textarea-overlay (real + @@ -92,5 +92,4 @@ -{% include '_editor_assets.html' %} {% endblock %} diff --git a/l4d2web/l4d2web/templates/blueprints.html b/l4d2web/l4d2web/templates/blueprints.html index 3c29a4d..e121413 100644 --- a/l4d2web/l4d2web/templates/blueprints.html +++ b/l4d2web/l4d2web/templates/blueprints.html @@ -33,11 +33,9 @@
- - {# Arguments, config, and overlay assignments are edited on the - blueprint detail page where the srccfg editor + overlay picker - live. Keeping the create modal name-only avoids the conflict - where modal textareas can't host the editor cleanly. #} + + +
diff --git a/l4d2web/l4d2web/templates/overlay_detail.html b/l4d2web/l4d2web/templates/overlay_detail.html index 19962f1..09f0d3f 100644 --- a/l4d2web/l4d2web/templates/overlay_detail.html +++ b/l4d2web/l4d2web/templates/overlay_detail.html @@ -22,7 +22,7 @@

Runs sandboxed against the overlay directory mounted at /overlay.

{% if not latest_build_is_running %} @@ -175,16 +175,7 @@
-
UTF-8 · 0 bytes @@ -282,11 +273,4 @@ {% endif %} -{# Only include the ~30 KB of editor assets on pages that actually mount - an editor: script-type overlays (bash editor) and files-type overlays - that the current user can edit (the files-editor modal). Workshop - overlays and read-only pages skip the include entirely. #} -{% if overlay.type == 'script' or files_can_edit %} - {% include '_editor_assets.html' %} -{% endif %} {% endblock %} diff --git a/l4d2web/tests/e2e/test_editor.py b/l4d2web/tests/e2e/test_editor.py deleted file mode 100644 index a5a87ed..0000000 --- a/l4d2web/tests/e2e/test_editor.py +++ /dev/null @@ -1,58 +0,0 @@ -"""End-to-end test for the textarea code editor. - -Logs in as the seed user, navigates to the blueprint detail page, types -`sv_che` into the editor, asserts the autocomplete popup appears with -`sv_cheats`, accepts via Tab, and asserts the underlying textarea now -contains `sv_cheats`. -""" - -import pytest -from playwright.sync_api import expect, sync_playwright - - -@pytest.mark.e2e -def test_editor_autocomplete_inserts_cvar(live_server) -> None: - base = live_server["base_url"] - blueprint_id = live_server["blueprint_id"] - - with sync_playwright() as p: - browser = p.chromium.launch() - ctx = browser.new_context() - page = ctx.new_page() - - # Log in. - page.goto(f"{base}/login") - page.fill('input[name="username"]', "alice") - page.fill('input[name="password"]', "secret") - page.click('button[type="submit"]') - expect(page).to_have_url(f"{base}/dashboard", timeout=5000) - - # Navigate to the seeded blueprint. - page.goto(f"{base}/blueprints/{blueprint_id}") - - # Editor mounts on DOMContentLoaded; the contenteditable replaces - # the textarea visually. Wait for it. - editor = page.locator(".editor-code").first - expect(editor).to_be_visible(timeout=5000) - - # Focus the editor and type a cvar prefix. - editor.click() - page.keyboard.type("sv_che") - - # The popup should appear and contain sv_cheats. - popup = page.locator(".editor-popup") - expect(popup).to_be_visible(timeout=2000) - expect(popup).to_contain_text("sv_cheats") - - # Accept via Tab. Verifies Task 9's capture-phase keydown fix: - # CodeJar would otherwise consume Tab and insert 2 spaces - # before our popup handler ran. - page.keyboard.press("Tab") - - # The hidden textarea (form field) must now contain the cvar. - textarea_value = page.evaluate( - "() => document.querySelector('textarea[name=config]').value" - ) - assert "sv_cheats" in textarea_value - - browser.close() diff --git a/l4d2web/tests/test_blueprints.py b/l4d2web/tests/test_blueprints.py index 7f5ee51..20982a3 100644 --- a/l4d2web/tests/test_blueprints.py +++ b/l4d2web/tests/test_blueprints.py @@ -253,62 +253,6 @@ def test_form_update_preserves_ordered_overlays_and_multiline_fields(user_client assert update.headers["Location"] == "/blueprints/1" -def test_blueprint_detail_renders_editor_assets(user_client) -> None: - with session_scope() as session: - user = session.scalar(select(User).where(User.username == "alice")) - blueprint = Blueprint(user_id=user.id, name="bp", arguments="[]", config="[]") - session.add(blueprint) - session.flush() - blueprint_id = blueprint.id - - response = user_client.get(f"/blueprints/{blueprint_id}") - assert response.status_code == 200 - body = response.get_data(as_text=True) - # Editor opts the textarea in via a data-attribute. - assert 'data-editor-language="srccfg"' in body - # All editor assets are referenced. prism.css intentionally not loaded - # — its default theme's `code[class*=language-]` selector beats our - # `.editor-code` background/color rules at higher specificity and - # breaks dark mode. We override every Prism token class we use in - # editor.css with theme-aware --color-* tokens instead. - assert "static/vendor/prism.js" in body - assert "static/vendor/codejar.js" in body - assert "static/js/srccfg-grammar.js" in body - assert "static/js/editor.js" in body - assert "static/css/editor.css" in body - assert "static/vendor/prism.css" not in body - # Scripts are nonce'd (CSP regression guard). - assert 'nonce="' in body - - -def test_blueprint_config_form_post_still_round_trips(user_client) -> None: - # The editor is a visual layer; the form POST contract must be - # unaffected. This guards against accidentally renaming `config` or - # dropping it from form serialization. - with session_scope() as session: - user = session.scalar(select(User).where(User.username == "alice")) - blueprint = Blueprint(user_id=user.id, name="bp", arguments="[]", config="[]") - session.add(blueprint) - session.flush() - blueprint_id = blueprint.id - - update = user_client.post( - f"/blueprints/{blueprint_id}", - data={ - "name": "bp", - "arguments": "", - "config": "sv_cheats 1\nmp_gamemode coop", - "overlay_ids": [], - }, - headers={"X-CSRF-Token": "test-token"}, - ) - assert update.status_code == 302 - - with session_scope() as session: - bp = session.get(Blueprint, blueprint_id) - assert json.loads(bp.config) == ["sv_cheats 1", "mp_gamemode coop"] - - def test_blueprint_detail_renders_picker_list_and_select(user_client) -> None: with session_scope() as session: session.add(Overlay(name="o3", path="/opt/l4d2/overlays/o3")) diff --git a/l4d2web/tests/test_script_overlay_routes.py b/l4d2web/tests/test_script_overlay_routes.py index 9d0b561..91897e7 100644 --- a/l4d2web/tests/test_script_overlay_routes.py +++ b/l4d2web/tests/test_script_overlay_routes.py @@ -277,25 +277,3 @@ def test_permissions_admin_can_edit_any(app, alice_id, admin_id) -> None: with session_scope() as s: overlay = s.query(Overlay).filter_by(id=overlay_id).one() assert overlay.script == "echo admin" - - -def test_script_overlay_detail_renders_bash_editor(app, alice_id) -> None: - overlay_id = _create_script_overlay(app, alice_id, name="bash-editor-test") - client = _client_for(app, alice_id) - - response = client.get(f"/overlays/{overlay_id}") - assert response.status_code == 200 - body = response.get_data(as_text=True) - # Editor opts the textarea in via a data-attribute. - assert 'data-editor-language="bash"' in body - # All editor assets are referenced. prism.css intentionally not loaded - # — see _editor_assets.html for the rationale (specificity conflict - # with our dark-mode tokens). - assert "static/vendor/prism.js" in body - assert "static/vendor/codejar.js" in body - assert "static/js/srccfg-grammar.js" in body - assert "static/js/editor.js" in body - assert "static/css/editor.css" in body - assert "static/vendor/prism.css" not in body - # Scripts are nonce'd (CSP regression guard). - assert 'nonce="' in body