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

Remove render_to_sx from public API: enforce sx_call for all service code
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 1m44s
Details

Browse Source 
Replace ~250 render_to_sx calls across all services with sync sx_call,
converting many async functions to sync where no other awaits remained.
Make render_to_sx/render_to_sx_with_env private (_render_to_sx).
Add (post-header-ctx) IO primitive and shared post/post-admin defmacros.
Convert built-in post/post-admin layouts from Python to register_sx_layout
with .sx defcomps. Remove dead post_admin_mobile_nav_sx.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
giles
2026-03-04 19:30:45 +00:00
parent 57e0d0c341
commit 959e63d440
61 changed files with 1352 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
blog/bp/menu_items/routes.py
View File

@@ -13,12 +13,12 @@ from .services.menu_items import (
MenuItemError,
)
from markupsafe import escape
from shared.sx.helpers import sx_response, render_to_sx
from shared.sx.helpers import sx_response, sx_call
from shared.sx.parser import SxExpr
from shared.browser.app.csrf import generate_csrf_token
async def _render_menu_items_list(menu_items):
def _render_menu_items_list(menu_items):
"""Serialize ORM menu items and render via .sx defcomp."""
csrf = generate_csrf_token()
items = []
@@ -32,8 +32,8 @@ async def _render_menu_items_list(menu_items):
"delete_url": url_for("menu_items.delete_menu_item_route", item_id=item.id),
})
new_url = url_for("menu_items.new_menu_item")
return await render_to_sx("blog-menu-items-content",
menu_items=items, new_url=new_url, csrf=csrf)
return sx_call("blog-menu-items-content",
menu_items=items, new_url=new_url, csrf=csrf)
def _render_menu_item_form(menu_item=None) -> str:
@@ -120,16 +120,16 @@ document.addEventListener('click', function(e) {{
return html
async def _render_page_search_results(pages, query, page, has_more) -> str:
def _render_page_search_results(pages, query, page, has_more) -> str:
"""Render page search results."""
if not pages and query:
return await render_to_sx("page-search-empty", query=query)
return sx_call("page-search-empty", query=query)
if not pages:
return ""
items = []
for post in pages:
items.append(await render_to_sx("page-search-item",
items.append(sx_call("page-search-item",
id=post.id, title=post.title,
slug=post.slug,
feature_image=post.feature_image or None))
@@ -137,22 +137,22 @@ async def _render_page_search_results(pages, query, page, has_more) -> str:
sentinel = ""
if has_more:
search_url = url_for("menu_items.search_pages_route")
sentinel = await render_to_sx("page-search-sentinel",
sentinel = sx_call("page-search-sentinel",
url=search_url, query=query,
next_page=page + 1)
items_sx = "(<> " + " ".join(items) + ")"
return await render_to_sx("page-search-results",
return sx_call("page-search-results",
items=SxExpr(items_sx),
sentinel=SxExpr(sentinel) if sentinel else None)
async def _render_menu_items_nav_oob(menu_items) -> str:
def _render_menu_items_nav_oob(menu_items) -> str:
"""Render OOB nav update for menu items."""
from quart import request as qrequest
if not menu_items:
return await render_to_sx("blog-nav-empty", wrapper_id="menu-items-nav-wrapper")
return sx_call("blog-nav-empty", wrapper_id="menu-items-nav-wrapper")
first_seg = qrequest.path.strip("/").split("/")[0] if qrequest else ""
@@ -185,23 +185,23 @@ async def _render_menu_items_nav_oob(menu_items) -> str:
href = f"/{item_slug}/"
selected = "true" if item_slug == first_seg else "false"
img_sx = await render_to_sx("img-or-placeholder", src=fi, alt=label,
img_sx = sx_call("img-or-placeholder", src=fi, alt=label,
size_cls="w-8 h-8 rounded-full object-cover flex-shrink-0")
if item_slug != "cart":
item_parts.append(await render_to_sx("blog-nav-item-link",
item_parts.append(sx_call("blog-nav-item-link",
href=href, hx_get=f"/{item_slug}/", selected=selected,
nav_cls=nav_button_cls, img=SxExpr(img_sx), label=label,
))
else:
item_parts.append(await render_to_sx("blog-nav-item-plain",
item_parts.append(sx_call("blog-nav-item-plain",
href=href, selected=selected, nav_cls=nav_button_cls,
img=SxExpr(img_sx), label=label,
))
items_sx = "(<> " + " ".join(item_parts) + ")" if item_parts else ""
return await render_to_sx("scroll-nav-wrapper",
return sx_call("scroll-nav-wrapper",
wrapper_id="menu-items-nav-wrapper", container_id=container_id,
arrow_cls=arrow_cls,
left_hs=f"on click set #{container_id}.scrollLeft to #{container_id}.scrollLeft - 200",
@@ -214,9 +214,9 @@ async def _render_menu_items_nav_oob(menu_items) -> str:
def register():
bp = Blueprint("menu_items", __name__, url_prefix='/settings/menu_items')
async def get_menu_items_nav_oob_async(menu_items):
def get_menu_items_nav_oob_sync(menu_items):
"""Helper to generate OOB update for root nav menu items"""
return await _render_menu_items_nav_oob(menu_items)
return _render_menu_items_nav_oob(menu_items)
@bp.get("/new/")
@require_admin
@@ -245,8 +245,8 @@ def register():
# Get updated list and nav OOB
menu_items = await get_all_menu_items(g.s)
html = await _render_menu_items_list(menu_items)
nav_oob = await get_menu_items_nav_oob_async(menu_items)
html = _render_menu_items_list(menu_items)
nav_oob = get_menu_items_nav_oob_sync(menu_items)
return sx_response(html + nav_oob)
except MenuItemError as e:
@@ -283,8 +283,8 @@ def register():
# Get updated list and nav OOB
menu_items = await get_all_menu_items(g.s)
html = await _render_menu_items_list(menu_items)
nav_oob = await get_menu_items_nav_oob_async(menu_items)
html = _render_menu_items_list(menu_items)
nav_oob = get_menu_items_nav_oob_sync(menu_items)
return sx_response(html + nav_oob)
except MenuItemError as e:
@@ -303,8 +303,8 @@ def register():
# Get updated list and nav OOB
menu_items = await get_all_menu_items(g.s)
html = await _render_menu_items_list(menu_items)
nav_oob = await get_menu_items_nav_oob_async(menu_items)
html = _render_menu_items_list(menu_items)
nav_oob = get_menu_items_nav_oob_sync(menu_items)
return sx_response(html + nav_oob)
@bp.get("/pages/search/")
@@ -318,7 +318,7 @@ def register():
pages, total = await search_pages(g.s, query, page, per_page)
has_more = (page * per_page) < total
return sx_response(await _render_page_search_results(pages, query, page, has_more))
return sx_response(_render_page_search_results(pages, query, page, has_more))
@bp.post("/reorder/")
@require_admin
@@ -342,8 +342,8 @@ def register():
# Get updated list and nav OOB
menu_items = await get_all_menu_items(g.s)
html = await _render_menu_items_list(menu_items)
nav_oob = await get_menu_items_nav_oob_async(menu_items)
html = _render_menu_items_list(menu_items)
nav_oob = get_menu_items_nav_oob_sync(menu_items)
return sx_response(html + nav_oob)
return bp