diff --git a/services/api-server/src/api_server/html5.py b/services/api-server/src/api_server/html5.py index 8842ac6..c36dabe 100644 --- a/services/api-server/src/api_server/html5.py +++ b/services/api-server/src/api_server/html5.py @@ -187,6 +187,7 @@ def render_html5_project_setup(*, project_id: str, projects: Iterable[object], s
{source_cards or '

Источники импорта не настроены

'}
+ {render_html5_settings_panel(project_id, setup)} {render_html5_setup_actions(project_id, setup)} {render_html5_setup_summary(project_id, setup)}
@@ -196,6 +197,32 @@ def render_html5_project_setup(*, project_id: str, projects: Iterable[object], s return _page(f"SFERA HTML5 setup - {project_id}", content) +def render_html5_settings_panel(project_id: str, setup: object, saved: bool = False) -> str: + settings = getattr(setup, "settings", None) + name = str(getattr(settings, "name", "") or "") + platform_version = str(getattr(settings, "platform_version", "") or "") + compatibility_mode = str(getattr(settings, "compatibility_mode", "") or "") + notice = 'Сохранено' if saved else "" + return f""" +
+
Базовые настройки {notice}
+
+ + + + +
+
+ """ + + def render_html5_setup_actions(project_id: str, setup: object) -> str: sources = getattr(setup, "import_sources", []) or [] current_source = _enum_text(getattr(setup, "current_source", None) or "") @@ -583,7 +610,7 @@ def _css() -> str: .layout{display:grid;grid-template-columns:280px minmax(0,1fr)320px;height:calc(100vh - 88px)}.panel{overflow:auto}.panel-title{padding:12px;border-bottom:1px solid var(--line);font-size:12px;font-weight:900;text-transform:uppercase;color:var(--muted)}.tree-item{display:block;padding:10px 12px;border-bottom:1px solid var(--line);text-decoration:none}.tree-item span{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.tree-item small{color:var(--muted)} .editor{min-width:0;overflow:hidden;border-top:0;border-bottom:0}.editor-head{height:72px;border-bottom:1px solid var(--line);padding:0 14px}.editor-head h1{margin:0;font-size:18px}.search{display:flex;gap:6px}.search input{height:32px;width:260px;border:1px solid var(--line);padding:0 10px}.code{height:calc(100% - 72px);margin:0;overflow:auto;padding:16px;background:#fbfaf7;font:13px/1.55 ui-monospace,SFMono-Regular,Consolas,monospace;white-space:pre-wrap} .metrics{display:grid;grid-template-columns:1fr 1fr;margin:0}.metrics div{padding:12px;border-bottom:1px solid var(--line)}.metrics dt{color:var(--muted);font-size:12px}.metrics dd{margin:2px 0 0;font-size:22px;font-weight:800}.compact{list-style:none;margin:0;padding:0}.compact li{display:flex;justify-content:space-between;padding:8px 12px;border-bottom:1px solid var(--line)}.symbol{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.symbol span,.symbol small{color:var(--muted)}.status{position:fixed;bottom:0;left:0;right:0;display:flex;gap:18px;overflow:auto;height:34px;align-items:center;border-top:1px solid var(--line);background:#fff;padding:0 12px;color:var(--muted);font-size:12px}.empty-state{max-width:720px;margin:80px auto;background:#fff;border:1px solid var(--line);padding:28px} -.setup-layout{display:grid;grid-template-columns:340px minmax(0,1fr);gap:16px;max-width:1180px;margin:18px auto;padding:0 16px}.setup-workspace{background:#f3f6fb}.setup-card{padding:16px;border-bottom:1px solid var(--line)}.setup-card h1{margin:0;font-size:24px}.setup-actions{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}.setup-main{min-height:620px}.setup-actions-panel{display:flex;gap:8px;flex-wrap:wrap;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fbfcfe}.inline-form{display:flex;gap:8px;align-items:end}.inline-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.inline-form select{height:32px;min-width:240px;border:1px solid var(--line);background:#fff;padding:0 8px}.setup-summary{display:grid;gap:0}.compact-lead{margin:0;padding:0 16px 16px}.setup-metrics{display:grid;grid-template-columns:repeat(4,1fr);margin:0;border-top:1px solid var(--line)}.setup-metrics div{padding:16px;border-right:1px solid var(--line);border-bottom:1px solid var(--line)}.setup-metrics div:last-child{border-right:0}.setup-metrics dt{font-size:12px;color:var(--muted)}.setup-metrics dd{margin:4px 0 0;font-size:28px;font-weight:900}.status-pill{border:1px solid var(--line);padding:6px 10px;background:#eef6f1;color:var(--ok);font-weight:800}.flush{border-top:1px solid var(--line)}.padded{padding:12px 16px;margin:0}.setup-detail,.history-item,.source-card,.check-item{display:grid;gap:3px;padding:12px 16px;border-bottom:1px solid var(--line)}.setup-detail span,.setup-detail small,.history-item span,.history-item small,.source-card span,.source-card small,.check-item span,.check-item small,.check-head span,.check-head small{color:var(--muted)}.source-list,.history-list,.check-list{display:grid}.check-head{display:flex;gap:10px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.job-log{margin:0;padding:0;list-style:none}.job-log li{padding:8px 16px;border-bottom:1px solid var(--line);color:var(--muted);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px} +.setup-layout{display:grid;grid-template-columns:340px minmax(0,1fr);gap:16px;max-width:1180px;margin:18px auto;padding:0 16px}.setup-workspace{background:#f3f6fb}.setup-card{padding:16px;border-bottom:1px solid var(--line)}.setup-card h1{margin:0;font-size:24px}.setup-actions{display:flex;gap:8px;flex-wrap:wrap;margin-top:14px}.setup-main{min-height:620px}.settings-form{display:grid;grid-template-columns:2fr 1fr 1fr auto;gap:8px;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.settings-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.settings-form input{height:32px;border:1px solid var(--line);padding:0 8px}.saved{float:right;color:var(--ok);font-weight:900}.setup-actions-panel{display:flex;gap:8px;flex-wrap:wrap;align-items:end;padding:12px 16px;border-bottom:1px solid var(--line);background:#fbfcfe}.inline-form{display:flex;gap:8px;align-items:end}.inline-form label{display:grid;gap:4px;font-size:12px;font-weight:800;color:var(--muted);text-transform:uppercase}.inline-form select{height:32px;min-width:240px;border:1px solid var(--line);background:#fff;padding:0 8px}.setup-summary{display:grid;gap:0}.compact-lead{margin:0;padding:0 16px 16px}.setup-metrics{display:grid;grid-template-columns:repeat(4,1fr);margin:0;border-top:1px solid var(--line)}.setup-metrics div{padding:16px;border-right:1px solid var(--line);border-bottom:1px solid var(--line)}.setup-metrics div:last-child{border-right:0}.setup-metrics dt{font-size:12px;color:var(--muted)}.setup-metrics dd{margin:4px 0 0;font-size:28px;font-weight:900}.status-pill{border:1px solid var(--line);padding:6px 10px;background:#eef6f1;color:var(--ok);font-weight:800}.flush{border-top:1px solid var(--line)}.padded{padding:12px 16px;margin:0}.setup-detail,.history-item,.source-card,.check-item{display:grid;gap:3px;padding:12px 16px;border-bottom:1px solid var(--line)}.setup-detail span,.setup-detail small,.history-item span,.history-item small,.source-card span,.source-card small,.check-item span,.check-item small,.check-head span,.check-head small{color:var(--muted)}.source-list,.history-list,.check-list{display:grid}.check-head{display:flex;gap:10px;align-items:center;padding:12px 16px;border-bottom:1px solid var(--line);background:#fff}.job-log{margin:0;padding:0;list-style:none}.job-log li{padding:8px 16px;border-bottom:1px solid var(--line);color:var(--muted);font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px} @media(max-width:980px){.layout{grid-template-columns:1fr;height:auto}.tree,.inspector{max-height:320px}.editor{min-height:520px}.hero{display:block}.shell{padding:16px}} -@media(max-width:980px){.setup-layout{grid-template-columns:1fr}.setup-metrics{grid-template-columns:1fr 1fr}} +@media(max-width:980px){.setup-layout{grid-template-columns:1fr}.setup-metrics{grid-template-columns:1fr 1fr}.settings-form{grid-template-columns:1fr}} """ diff --git a/services/api-server/src/api_server/main.py b/services/api-server/src/api_server/main.py index ae60a65..9f0eb94 100644 --- a/services/api-server/src/api_server/main.py +++ b/services/api-server/src/api_server/main.py @@ -42,6 +42,7 @@ from api_server.html5 import ( render_html5_project_rows, render_html5_import_check, render_html5_import_job, + render_html5_settings_panel, render_html5_setup_summary, render_html5_source, render_html5_status, @@ -1694,6 +1695,24 @@ async def html5_project_setup_source(project_id: str, request: Request) -> Respo ) +@app.post("/html5/projects/{project_id}/setup/settings") +async def html5_project_setup_settings(project_id: str, request: Request) -> Response: + form = await _html5_form_data(request) + current = _project_setup_response(project_id) + settings = current.settings.model_copy( + update={ + "name": _form_value(form, "name") or current.settings.name, + "platform_version": _form_value(form, "platform_version"), + "compatibility_mode": _form_value(form, "compatibility_mode"), + } + ) + setup = await save_project_settings(project_id, settings) + return Response( + render_html5_settings_panel(project_id, setup, saved=True), + media_type="text/html; charset=utf-8", + ) + + @app.post("/html5/projects/{project_id}/setup/check") async def html5_project_setup_check(project_id: str, request: Request) -> Response: form = await _html5_form_data(request) diff --git a/services/api-server/tests/test_api.py b/services/api-server/tests/test_api.py index 7656ac6..f424eee 100644 --- a/services/api-server/tests/test_api.py +++ b/services/api-server/tests/test_api.py @@ -193,8 +193,10 @@ def test_html5_project_setup_renders_server_fragments(): assert "text/html" in setup.headers["content-type"] assert 'data-html5-page="setup"' in setup.text assert "HTML5 Setup Demo" in setup.text + assert "data-html5-settings-panel" in setup.text assert "data-html5-setup-summary" in setup.text assert f'hx-get="/html5/projects/{project_id}/setup/summary"' in setup.text + assert f'hx-post="/html5/projects/{project_id}/setup/settings"' in setup.text assert f'hx-post="/html5/projects/{project_id}/setup/source"' in setup.text assert f'hx-post="/html5/projects/{project_id}/setup/check"' in setup.text assert f'hx-post="/html5/projects/{project_id}/setup/import-job"' in setup.text @@ -205,6 +207,25 @@ def test_html5_project_setup_renders_server_fragments(): assert "XML_DUMP" in setup.text assert "__next" not in setup.text + settings = client.post( + f"/html5/projects/{project_id}/setup/settings", + data={ + "name": "HTML5 Renamed", + "platform_version": "8.3.25", + "compatibility_mode": "8.3.21", + }, + ) + assert settings.status_code == 200 + assert "data-html5-settings-panel" in settings.text + assert "HTML5 Renamed" in settings.text + assert "8.3.25" in settings.text + assert "Сохранено" in settings.text + assert "