diff --git a/services/api-server/src/api_server/html5.py b/services/api-server/src/api_server/html5.py index b0aa39f..6f59f5c 100644 --- a/services/api-server/src/api_server/html5.py +++ b/services/api-server/src/api_server/html5.py @@ -223,6 +223,7 @@ def render_html5_editor(
Diagnostics
{len(snapshot.diagnostics)}
Modules
{len(modules)}
+ {render_html5_object_context(project_id, None, None)}
Типы
Результаты
@@ -315,6 +316,48 @@ def render_html5_review(project_id: str, findings: list[dict] | None) -> str: """ +def render_html5_object_context(project_id: str, schema: object | None, impact: object | None) -> str: + if schema is None or impact is None: + return f""" +
+
Object context
+

Выберите объект метаданных, чтобы сервер собрал schema/impact контекст проекта {escape(project_id)}.

+
+ """ + obj = getattr(schema, "object", None) or getattr(impact, "object", None) + name = getattr(obj, "qualified_name", None) or getattr(obj, "name", None) or "object" + attributes = getattr(schema, "attributes", []) or [] + sections = getattr(schema, "tabular_sections", []) or [] + modules = getattr(impact, "modules", []) or [] + routines = getattr(impact, "routines", []) or [] + forms = getattr(impact, "forms", []) or [] + roles = getattr(impact, "roles", []) or [] + jobs = getattr(impact, "jobs", []) or [] + return f""" +
+
Object context
+
+ {escape(str(name))} + {escape(str(getattr(obj, "kind", "object")))} +
+
+ {_metric("Attrs", len(attributes))} + {_metric("Tables", len(sections))} + {_metric("Modules", len(modules))} + {_metric("Routines", len(routines))} + {_metric("Forms", len(forms))} + {_metric("Roles", len(roles))} +
+
+ {''.join(_named_node_item("attr", item) for item in attributes[:6]) or '

Реквизиты не найдены

'} + {''.join(_tabular_section_item(item) for item in sections[:4])} + {''.join(_named_node_item("routine", item) for item in routines[:6])} + {''.join(_named_node_item("job", item) for item in jobs[:4])} +
+
+ """ + + def render_html5_authoring_changes(project_id: str, changes: Iterable[object] | None) -> str: if changes is None: return f""" @@ -1204,12 +1247,29 @@ def _tree_item(project_id: str, node: object) -> str: kind = getattr(node, "kind", "") kind_value = str(kind.value if hasattr(kind, "value") else kind) lineage_id = str(getattr(node, "lineage_id", "")) + object_kinds = { + NodeKind.CATALOG.value, + NodeKind.DOCUMENT.value, + NodeKind.REGISTER.value, + NodeKind.COMMON_MODULE.value, + NodeKind.REPORT.value, + NodeKind.DATA_PROCESSOR.value, + } + if kind_value in object_kinds: + htmx_attrs = ( + f'hx-get="/html5/projects/{quote(project_id)}/objects/context/{quote(str(name), safe="")}" ' + 'hx-target="[data-html5-object-context]" hx-swap="outerHTML"' + ) + else: + htmx_attrs = ( + f'hx-get="/html5/projects/{quote(project_id)}/source/{quote(lineage_id, safe="")}" ' + 'hx-target="[data-html5-source]" hx-swap="outerHTML"' + ) return ( f'' + f'{htmx_attrs}>' f'{escape(str(name))}{escape(kind_value)}' ) @@ -1283,6 +1343,29 @@ def _authoring_change_item(change: object) -> str: """ +def _named_node_item(label: str, node: object) -> str: + name = getattr(node, "qualified_name", None) or getattr(node, "name", "") + kind = getattr(node, "kind", label) + return f""" +
+ {escape(str(name))} + {escape(str(kind))} +
+ """ + + +def _tabular_section_item(section: object) -> str: + tabular_section = getattr(section, "tabular_section", None) + columns = getattr(section, "columns", []) or [] + name = getattr(tabular_section, "qualified_name", None) or getattr(tabular_section, "name", "") + return f""" +
+ {escape(str(name))} + {escape(str(len(columns)))} columns +
+ """ + + def _authoring_diff_item(line: object) -> str: kind = str(getattr(line, "kind", "")) text = str(getattr(line, "text", "")) @@ -1406,7 +1489,7 @@ def _css() -> str: .workspace{min-height:100vh;padding-bottom:34px}.topbar{position:sticky;top:0;z-index:2;height:54px;border-bottom:1px solid var(--line);background:rgba(255,255,255,.94);padding:0 14px}.brand{font-weight:900;text-decoration:none;color:var(--brand)}.project-nav{display:flex;gap:6px;overflow:auto;flex:1}.project-link{white-space:nowrap;text-decoration:none;border:1px solid var(--line);padding:6px 10px;background:#fff}.project-link.active{background:var(--brand);border-color:var(--brand);color:#fff} .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}.source-panel{height:calc(100% - 72px);display:grid;grid-template-rows:auto minmax(0,1fr);overflow:hidden}.source-head{display:flex;justify-content:space-between;gap:12px;align-items:center;min-height:54px;padding:10px 14px;border-bottom:1px solid var(--line);background:#fff}.source-head strong,.source-head small{display:block}.source-head small{color:var(--muted)}.source-head dl{display:flex;gap:12px;margin:0}.source-head div div{padding:0}.source-head dt{font-size:11px;color:var(--muted)}.source-head dd{margin:0;font-weight:800}.code{height:100%;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);cursor:pointer}.symbol:hover{background:#f8fbff}.symbol span,.symbol small{color:var(--muted)}.symbol-focus,.symbol-reference{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.symbol-focus small,.symbol-reference span,.symbol-reference small{color:var(--muted)}.report-grid{display:grid;grid-template-columns:1fr 1fr;margin:0}.report-grid div{padding:10px 12px;border-bottom:1px solid var(--line)}.report-grid dt{color:var(--muted);font-size:12px}.report-grid dd{margin:2px 0 0;font-size:20px;font-weight:900}.review-item,.authoring-change{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.authoring-change[hx-get]{cursor:pointer}.authoring-change[hx-get]:hover{background:#f8fbff}.review-item span,.review-item small,.authoring-change span,.authoring-change small{color:var(--muted)}.diff-item{display:grid;grid-template-columns:72px minmax(0,1fr);gap:8px;padding:8px 12px;border-bottom:1px solid var(--line)}.diff-item span{color:var(--muted);font-weight:800}.diff-item code{white-space:pre-wrap;font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px}.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} +.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);cursor:pointer}.symbol:hover{background:#f8fbff}.symbol span,.symbol small{color:var(--muted)}.symbol-focus,.symbol-reference,.object-focus,.object-context-item{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.symbol-focus small,.symbol-reference span,.symbol-reference small,.object-focus span,.object-context-item small{color:var(--muted)}.report-grid{display:grid;grid-template-columns:1fr 1fr;margin:0}.report-grid div{padding:10px 12px;border-bottom:1px solid var(--line)}.report-grid dt{color:var(--muted);font-size:12px}.report-grid dd{margin:2px 0 0;font-size:20px;font-weight:900}.review-item,.authoring-change{display:grid;gap:3px;padding:10px 12px;border-bottom:1px solid var(--line)}.authoring-change[hx-get]{cursor:pointer}.authoring-change[hx-get]:hover{background:#f8fbff}.review-item span,.review-item small,.authoring-change span,.authoring-change small{color:var(--muted)}.diff-item{display:grid;grid-template-columns:72px minmax(0,1fr);gap:8px;padding:8px 12px;border-bottom:1px solid var(--line)}.diff-item span{color:var(--muted);font-weight:800}.diff-item code{white-space:pre-wrap;font-family:ui-monospace,SFMono-Regular,Consolas,monospace;font-size:12px}.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}.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}.rollback-form,.authoring-preview-form{display:grid;grid-template-columns:1fr 1fr;gap:8px;padding:12px;border-bottom:1px solid var(--line);background:#fbfcfe}.rollback-form input,.authoring-preview-form input,.authoring-preview-form textarea{min-width:0;border:1px solid var(--line);padding:0 8px}.rollback-form input,.authoring-preview-form input{height:32px}.authoring-preview-form textarea{grid-column:1/-1;min-height:88px;padding:8px;resize:vertical;font:12px/1.45 ui-monospace,SFMono-Regular,Consolas,monospace}.rollback-form button,.authoring-preview-form button{grid-column:1/-1}.setup-summary{display:grid;gap:0}.compact-lead{margin:0;padding:0 16px 16px}.setup-metrics,.ops-summary{display:grid;grid-template-columns:repeat(4,1fr);margin:0;border-top:1px solid var(--line)}.ops-summary{grid-template-columns:repeat(5,1fr);margin:12px 0}.setup-metrics div,.ops-summary div{padding:16px;border-right:1px solid var(--line);border-bottom:1px solid var(--line);background:#fff}.setup-metrics div:last-child,.ops-summary div:last-child{border-right:0}.setup-metrics dt,.ops-summary dt{font-size:12px;color:var(--muted)}.setup-metrics dd,.ops-summary 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}.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 62964ec..6fee6b9 100644 --- a/services/api-server/src/api_server/main.py +++ b/services/api-server/src/api_server/main.py @@ -46,6 +46,7 @@ from api_server.html5 import ( render_html5_index, render_html5_metadata_apply_result, render_html5_metadata_preview_result, + render_html5_object_context, render_html5_project_setup, render_html5_project_rows, render_html5_project_report, @@ -1740,6 +1741,16 @@ async def html5_project_review(project_id: str) -> Response: ) +@app.get("/html5/projects/{project_id}/objects/context/{object_name}") +async def html5_project_object_context(project_id: str, object_name: str) -> Response: + schema = await get_object_schema(project_id, object_name) + impact = await get_object_impact(project_id, object_name) + return Response( + render_html5_object_context(project_id, schema, impact), + media_type="text/html; charset=utf-8", + ) + + @app.get("/html5/projects/{project_id}/authoring/changes") async def html5_project_authoring_changes(project_id: str) -> Response: return Response( diff --git a/services/api-server/tests/test_api.py b/services/api-server/tests/test_api.py index 1601210..4664830 100644 --- a/services/api-server/tests/test_api.py +++ b/services/api-server/tests/test_api.py @@ -227,6 +227,41 @@ def test_html5_project_index_creates_project_with_fragment(): assert deleted_setup.json()["status"] == "NOT_CONFIGURED" +def test_html5_object_context_fragment(tmp_path: Path): + project_id = f"html5-object-context-{uuid4()}" + (tmp_path / "metadata.xml").write_text( + """ + + + + + + + + +""", + encoding="utf-8", + ) + client = TestClient(app) + indexed = client.post("/projects/index", json={"path": str(tmp_path), "project_id": project_id}) + assert indexed.status_code == 200 + + editor = client.get(f"/html5/projects/{project_id}/editor") + assert editor.status_code == 200 + assert "data-html5-object-context" in editor.text + assert f'hx-get="/html5/projects/{project_id}/objects/context/%D0%94%D0%BE%D0%BA%D1%83%D0%BC%D0%B5%D0%BD%D1%82.%D0%97%D0%B0%D0%BA%D0%B0%D0%B7%D0%9F%D0%BE%D0%BA%D1%83%D0%BF%D0%B0%D1%82%D0%B5%D0%BB%D1%8F"' in editor.text + assert 'hx-target="[data-html5-object-context]"' in editor.text + + context = client.get(f"/html5/projects/{project_id}/objects/context/Документ.ЗаказПокупателя") + assert context.status_code == 200 + assert "text/html" in context.headers["content-type"] + assert "data-html5-object-context" in context.text + assert "Документ.ЗаказПокупателя" in context.text + assert "Контрагент" in context.text + assert "Товары" in context.text + assert "