coop/rose-ash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge worktree-api-urls: fix Python string-form component name refs

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-12 22:14:08 +00:00
parent 1647921895 6186cd1c53
commit c6a4a6f65c
8 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cart/sxc/pages/renders.py
View File

@@ -15,7 +15,7 @@ async def render_orders_page(ctx, orders, page, total_pages, search, search_coun
order_dicts = [_serialize_order(o) for o in orders]
content = sx_call("orders-list-content", orders=order_dicts,
page=page, total_pages=total_pages, rows_url=list_url, detail_url_prefix=detail_url_prefix)
header_rows = await render_to_sx_with_env("cart-orders-layout-full", {},
header_rows = await render_to_sx_with_env("layouts/orders-layout-full", {},
list_url=list_url,
)
filt = sx_call("order-list-header", search_mobile=await search_mobile_sx(ctx))
@@ -47,7 +47,7 @@ async def render_orders_oob(ctx, orders, page, total_pages, search, search_count
order_dicts = [_serialize_order(o) for o in orders]
content = sx_call("orders-list-content", orders=order_dicts,
page=page, total_pages=total_pages, rows_url=list_url, detail_url_prefix=detail_url_prefix)
oobs = await render_to_sx_with_env("cart-orders-layout-oob", {},
oobs = await render_to_sx_with_env("layouts/orders-layout-oob", {},
list_url=list_url,
)
filt = sx_call("order-list-header", search_mobile=await search_mobile_sx(ctx))
@@ -68,7 +68,7 @@ async def render_order_page(ctx, order, calendar_entries, url_for_fn):
main = sx_call("order-detail-content", order=order_data, calendar_entries=cal_data)
filt = sx_call("order-detail-filter-content", order=order_data,
list_url=list_url, recheck_url=recheck_url, pay_url=pay_url, csrf=generate_csrf_token())
header_rows = await render_to_sx_with_env("cart-order-detail-layout-full", {},
header_rows = await render_to_sx_with_env("layouts/order-detail-layout-full", {},
list_url=list_url, detail_url=detail_url,
order_label=f"Order {order.id}",
)
@@ -89,7 +89,7 @@ async def render_order_oob(ctx, order, calendar_entries, url_for_fn):
main = sx_call("order-detail-content", order=order_data, calendar_entries=cal_data)
filt = sx_call("order-detail-filter-content", order=order_data,
list_url=list_url, recheck_url=recheck_url, pay_url=pay_url, csrf=generate_csrf_token())
oobs = await render_to_sx_with_env("cart-order-detail-layout-oob", {},
oobs = await render_to_sx_with_env("layouts/order-detail-layout-oob", {},
detail_url=detail_url,
order_label=f"Order {order.id}",
)
@@ -100,7 +100,7 @@ async def render_checkout_error_page(ctx, error=None, order=None):
from shared.sx.helpers import sx_call, render_to_sx_with_env, full_page_sx
from shared.infrastructure.urls import cart_url
err_msg = error or "Unexpected error while creating the hosted checkout session."
hdr = await render_to_sx_with_env("layout-root-full", {})
hdr = await render_to_sx_with_env("shared:layout/root-full", {})
filt = sx_call("checkout-error-header")
content = sx_call("cart-checkout-error-from-data",
msg=err_msg, order_id=order.id if order else None,

10
events/sxc/pages/renders.py
View File

@@ -44,7 +44,7 @@ async def render_all_events_page(ctx: dict, entries, has_more, pending_tickets,
ctx, entries, has_more, pending_tickets, page_info,
page, view, ticket_url, next_url, events_url,
)
hdr = await render_to_sx_with_env("layout-root-full", {})
hdr = await render_to_sx_with_env("shared:layout/root-full", {})
return await full_page_sx(ctx, header_rows=hdr, content=content)
@@ -105,7 +105,7 @@ async def render_page_summary_page(ctx: dict, entries, has_more, pending_tickets
is_page_scoped=True, post=post,
)
hdr = await render_to_sx_with_env("layout-root-full", {})
hdr = await render_to_sx_with_env("shared:layout/root-full", {})
hdr += await header_child_sx(await _post_header_sx(ctx))
return await full_page_sx(ctx, header_rows=hdr, content=content)
@@ -160,7 +160,7 @@ async def render_calendars_page(ctx: dict) -> str:
content = _calendars_main_panel_sx(ctx)
ctx = await _ensure_container_nav(ctx)
slug = (ctx.get("post") or {}).get("slug", "")
root_hdr = await render_to_sx_with_env("layout-root-full", {})
root_hdr = await render_to_sx_with_env("shared:layout/root-full", {})
post_hdr = await _post_header_sx(ctx)
admin_hdr = await post_admin_header_sx(ctx, slug, selected="calendars")
return await full_page_sx(ctx, header_rows=root_hdr + post_hdr + admin_hdr, content=content)
@@ -183,7 +183,7 @@ async def render_calendars_oob(ctx: dict) -> str:
async def render_calendar_page(ctx: dict) -> str:
"""Full page: calendar month view."""
content = _calendar_main_panel_html(ctx)
hdr = await render_to_sx_with_env("layout-root-full", {})
hdr = await render_to_sx_with_env("shared:layout/root-full", {})
child = await _post_header_sx(ctx) + _calendar_header_sx(ctx)
hdr += await header_child_sx(child)
return await full_page_sx(ctx, header_rows=hdr, content=content)
@@ -206,7 +206,7 @@ async def render_calendar_oob(ctx: dict) -> str:
async def render_day_page(ctx: dict) -> str:
"""Full page: day detail."""
content = _day_main_panel_html(ctx)
hdr = await render_to_sx_with_env("layout-root-full", {})
hdr = await render_to_sx_with_env("shared:layout/root-full", {})
child = (await _post_header_sx(ctx)
+ _calendar_header_sx(ctx) + _day_header_sx(ctx))
hdr += await header_child_sx(child)

2
federation/sxc/pages/utils.py
View File

@@ -27,7 +27,7 @@ async def _social_page(ctx: dict, actor, *, content: str,
from markupsafe import escape
env = {"actor": _serialize_actor(actor) if actor else None}
header_rows = await render_to_sx_with_env("social-layout-full", env)
header_rows = await render_to_sx_with_env("layouts/social-layout-full", env)
return await full_page_sx(ctx, header_rows=header_rows, content=content,
meta_html=meta_html or f'<title>{escape(title)}</title>')

6
market/sxc/pages/renders.py
View File

@@ -30,7 +30,7 @@ async def render_browse_page(ctx: dict) -> str:
content = sx_call("market-product-grid", cards=SxExpr(_product_cards_sx(ctx)))
from shared.sx.helpers import render_to_sx_with_env
hdr = await render_to_sx_with_env("market-browse-layout-full", {})
hdr = await render_to_sx_with_env("layouts/browse-layout-full", {})
menu = _mobile_nav_panel_sx(ctx)
filter_sx = await _mobile_filter_summary_sx(ctx)
aside_sx = await _desktop_filter_sx(ctx)
@@ -68,7 +68,7 @@ async def render_product_page(ctx: dict, d: dict) -> str:
meta = _product_meta_sx(d, ctx)
from shared.sx.helpers import render_to_sx_with_env
hdr = await render_to_sx_with_env("market-product-layout-full", {},
hdr = await render_to_sx_with_env("layouts/product-layout-full", {},
post_header=await _post_header_sx(ctx),
market_header=_market_header_sx(ctx),
product_header=_product_header_sx(ctx, d))
@@ -96,7 +96,7 @@ async def render_product_admin_page(ctx: dict, d: dict) -> str:
content = _product_detail_sx(d, ctx)
from shared.sx.helpers import render_to_sx_with_env
hdr = await render_to_sx_with_env("market-product-admin-layout-full", {},
hdr = await render_to_sx_with_env("layouts/product-admin-layout-full", {},
post_header=await _post_header_sx(ctx),
market_header=_market_header_sx(ctx),
product_header=_product_header_sx(ctx, d),

36
shared/sx/helpers.py
View File

@@ -69,7 +69,7 @@ async def root_header_sx(ctx: dict, *, oob: bool = False) -> str:
rights = ctx.get("rights") or {}
is_admin = rights.get("admin") if isinstance(rights, dict) else getattr(rights, "admin", False)
settings_url = call_url(ctx, "blog_url", "/settings/") if is_admin else ""
return await _render_to_sx("header-row-sx",
return await _render_to_sx("shared:layout/header-row-sx",
cart_mini=_as_sx(ctx.get("cart_mini")),
blog_url=call_url(ctx, "blog_url", ""),
site_title=ctx.get("base_title", ""),
@@ -95,7 +95,7 @@ async def mobile_root_nav_sx(ctx: dict) -> str:
auth_menu = ctx.get("auth_menu") or ""
if not nav_tree and not auth_menu:
return ""
return await _render_to_sx("mobile-root-nav",
return await _render_to_sx("shared:layout/mobile-root-nav",
nav_tree=_as_sx(nav_tree),
auth_menu=_as_sx(auth_menu),
)
@@ -116,13 +116,13 @@ async def _post_nav_items_sx(ctx: dict) -> SxExpr:
page_cart_count = ctx.get("page_cart_count", 0)
if page_cart_count and page_cart_count > 0:
cart_href = call_url(ctx, "cart_url", f"/{slug}/")
parts.append(await _render_to_sx("page-cart-badge", href=cart_href,
parts.append(await _render_to_sx("shared:layout/page-cart-badge", href=cart_href,
count=str(page_cart_count)))
container_nav = str(ctx.get("container_nav") or "").strip()
# Skip empty fragment wrappers like "(<> )"
if container_nav and container_nav.replace("(<>", "").replace(")", "").strip():
parts.append(await _render_to_sx("container-nav-wrapper",
parts.append(await _render_to_sx("shared:layout/container-nav-wrapper",
content=SxExpr(container_nav)))
# Admin cog
@@ -134,7 +134,7 @@ async def _post_nav_items_sx(ctx: dict) -> SxExpr:
from quart import request
admin_href = call_url(ctx, "blog_url", f"/{slug}/admin/")
is_admin_page = ctx.get("is_admin_section") or "/admin" in request.path
admin_nav = await _render_to_sx("admin-cog-button",
admin_nav = await _render_to_sx("shared:layout/admin-cog-button",
href=admin_href,
is_admin_page=is_admin_page or None)
if admin_nav:
@@ -164,7 +164,7 @@ async def _post_admin_nav_items_sx(ctx: dict, slug: str,
continue
href = url_fn(path)
is_sel = label == selected
parts.append(await _render_to_sx("nav-link", href=href, label=label,
parts.append(await _render_to_sx("shared:layout/nav-link", href=href, label=label,
select_colours=select_colours,
is_selected=is_sel or None))
return _sx_fragment(*parts) if parts else SxExpr("")
@@ -182,7 +182,7 @@ async def post_mobile_nav_sx(ctx: dict) -> str:
post = ctx.get("post") or {}
slug = post.get("slug", "")
title = (post.get("title") or slug)[:40]
return await _render_to_sx("mobile-menu-section",
return await _render_to_sx("shared:layout/mobile-menu-section",
label=title,
href=call_url(ctx, "blog_url", f"/{slug}/"),
level=1,
@@ -193,7 +193,7 @@ async def post_mobile_nav_sx(ctx: dict) -> str:
async def search_mobile_sx(ctx: dict) -> str:
"""Build mobile search input as sx wire format."""
return await _render_to_sx("search-mobile",
return await _render_to_sx("shared:controls/search-mobile",
current_local_href=ctx.get("current_local_href", "/"),
search=ctx.get("search", ""),
search_count=ctx.get("search_count", ""),
@@ -204,7 +204,7 @@ async def search_mobile_sx(ctx: dict) -> str:
async def search_desktop_sx(ctx: dict) -> str:
"""Build desktop search input as sx wire format."""
return await _render_to_sx("search-desktop",
return await _render_to_sx("shared:controls/search-desktop",
current_local_href=ctx.get("current_local_href", "/"),
search=ctx.get("search", ""),
search_count=ctx.get("search_count", ""),
@@ -222,11 +222,11 @@ async def post_header_sx(ctx: dict, *, oob: bool = False, child: str = "") -> st
title = (post.get("title") or "")[:160]
feature_image = post.get("feature_image")
label_sx = await _render_to_sx("post-label", feature_image=feature_image, title=title)
label_sx = await _render_to_sx("shared:layout/post-label", feature_image=feature_image, title=title)
nav_sx = await _post_nav_items_sx(ctx) or None
link_href = call_url(ctx, "blog_url", f"/{slug}/")
return await _render_to_sx("menu-row-sx",
return await _render_to_sx("shared:layout/menu-row-sx",
id="post-row", level=1,
link_href=link_href,
link_label_content=label_sx,
@@ -241,7 +241,7 @@ async def post_admin_header_sx(ctx: dict, slug: str, *, oob: bool = False,
selected: str = "", admin_href: str = "") -> str:
"""Post admin header row as sx wire format."""
# Label
label_sx = await _render_to_sx("post-admin-label",
label_sx = await _render_to_sx("shared:layout/post-admin-label",
selected=str(escape(selected)) if selected else None)
nav_sx = await _post_admin_nav_items_sx(ctx, slug, selected) or None
@@ -250,7 +250,7 @@ async def post_admin_header_sx(ctx: dict, slug: str, *, oob: bool = False,
blog_fn = ctx.get("blog_url")
admin_href = blog_fn(f"/{slug}/admin/") if callable(blog_fn) else f"/{slug}/admin/"
return await _render_to_sx("menu-row-sx",
return await _render_to_sx("shared:layout/menu-row-sx",
id="post-admin-row", level=2,
link_href=admin_href,
link_label_content=label_sx,
@@ -265,7 +265,7 @@ async def oob_header_sx(parent_id: str, child_id: str, row_sx: str) -> str:
child_id is accepted for call-site compatibility but no longer used —
the child placeholder is created by ~shared:layout/menu-row-sx itself.
"""
return await _render_to_sx("oob-header-sx",
return await _render_to_sx("shared:layout/oob-header-sx",
parent_id=parent_id,
row=SxExpr(row_sx),
)
@@ -273,7 +273,7 @@ async def oob_header_sx(parent_id: str, child_id: str, row_sx: str) -> str:
async def header_child_sx(inner_sx: str, *, id: str = "root-header-child") -> str:
"""Wrap inner sx in a header-child div."""
return await _render_to_sx("header-child-sx",
return await _render_to_sx("shared:layout/header-child-sx",
id=id, inner=_sx_fragment(inner_sx),
)
@@ -281,7 +281,7 @@ async def header_child_sx(inner_sx: str, *, id: str = "root-header-child") -> st
async def oob_page_sx(*, oobs: str = "", filter: str = "", aside: str = "",
content: str = "", menu: str = "") -> str:
"""Build OOB response as sx wire format."""
return await _render_to_sx("oob-sx",
return await _render_to_sx("shared:layout/oob-sx",
oobs=_sx_fragment(oobs) if oobs else None,
filter=SxExpr(filter) if filter else None,
aside=SxExpr(aside) if aside else None,
@@ -307,7 +307,7 @@ async def full_page_sx(ctx: dict, *, header_rows: str,
# Auto-generate mobile nav from context when no menu provided
if not menu:
menu = await mobile_root_nav_sx(ctx)
body_sx = await _render_to_sx("app-body",
body_sx = await _render_to_sx("shared:layout/app-body",
header_rows=_sx_fragment(header_rows) if header_rows else None,
filter=SxExpr(filter) if filter else None,
aside=SxExpr(aside) if aside else None,
@@ -876,7 +876,7 @@ async def sx_page(ctx: dict, page_sx: str, *,
shell_kwargs["init_sx"] = init_sx
if body_scripts is not None:
shell_kwargs["body_scripts"] = body_scripts
return await render_to_html("sx-page-shell", **shell_kwargs)
return await render_to_html("shared:shell/sx-page-shell", **shell_kwargs)
_SX_STREAMING_RESOLVE = """\

2
shared/sx/pages.py
View File

@@ -545,7 +545,7 @@ async def execute_page_streaming(
else:
suspense_content_sx = f'(~shared:pages/suspense :id "stream-content" :fallback {fallback_sx})'
initial_page_html = await _helpers_render_to_html("app-body",
initial_page_html = await _helpers_render_to_html("shared:layout/app-body",
header_rows=SxExpr(suspense_header_sx),
content=SxExpr(suspense_content_sx),
)

4
test-sx-web/sxc/pages/renders.py
View File

@@ -99,7 +99,7 @@ async def render_dashboard_page_sx(ctx: dict, result: dict | None,
inner = sx_call("test-results-partial",
summary_data=summary_data, sections=sections, has_failures=has_failures)
content = sx_call("test-results-wrap", running=running, inner=inner)
hdr = await render_to_sx_with_env("test-layout-full", {},
hdr = await render_to_sx_with_env("components/test-layout-full", {},
services=_service_list(),
active_service=active_service,
)
@@ -131,7 +131,7 @@ async def render_results_partial_sx(result: dict | None, running: bool,
async def render_test_detail_page_sx(ctx: dict, test: dict) -> str:
"""Full page: test detail (sx wire format)."""
hdr = await render_to_sx_with_env("test-detail-layout-full", {},
hdr = await render_to_sx_with_env("components/test-detail-layout-full", {},
services=_service_list(),
test_nodeid=test["nodeid"],
test_label=test["nodeid"].rsplit("::", 1)[-1],

4
test/sxc/pages/renders.py
View File

@@ -99,7 +99,7 @@ async def render_dashboard_page_sx(ctx: dict, result: dict | None,
inner = sx_call("test-results-partial",
summary_data=summary_data, sections=sections, has_failures=has_failures)
content = sx_call("test-results-wrap", running=running, inner=inner)
hdr = await render_to_sx_with_env("test-layout-full", {},
hdr = await render_to_sx_with_env("components/test-layout-full", {},
services=_service_list(),
active_service=active_service,
)
@@ -131,7 +131,7 @@ async def render_results_partial_sx(result: dict | None, running: bool,
async def render_test_detail_page_sx(ctx: dict, test: dict) -> str:
"""Full page: test detail (sx wire format)."""
hdr = await render_to_sx_with_env("test-detail-layout-full", {},
hdr = await render_to_sx_with_env("components/test-detail-layout-full", {},
services=_service_list(),
test_nodeid=test["nodeid"],
test_label=test["nodeid"].rsplit("::", 1)[-1],