BetterCorp/BetterFrame
1
0
Fork 0
mirror of https://github.com/BetterCorp/BetterFrame.git synced 2026-05-26 17:56:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(admin): cell edit no longer corrupts grid when spans change

Browse source 
Use hx-retarget/hx-reswap response headers to replace full grid
when cell dimensions change (overlap resolution may move other cells).
Single-cell swap when only content fields change.
This commit is contained in:
Mitchell R 2026-05-21 15:12:55 +02:00
parent b05cdfc153
commit 6e10913380
No known key found for this signature in database
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
server/src/plugins/service-admin-http/routes-admin.ts
View file

@ -1083,9 +1083,11 @@ export function registerAdminRoutes(app: H3, deps: AdminDeps): void {
if (rowSpanRaw != null && String(rowSpanRaw).trim() !== "") { if (rowSpanRaw != null && String(rowSpanRaw).trim() !== "") {
dimsPatch["row_span"] = Math.max(1, Number(rowSpanRaw) || 1); dimsPatch["row_span"] = Math.max(1, Number(rowSpanRaw) || 1);
} }
let spansChanged = false;
if (Object.keys(dimsPatch).length > 0) { if (Object.keys(dimsPatch).length > 0) {
deps.repo.updateLayoutCell(cellId, dimsPatch as any); deps.repo.updateLayoutCell(cellId, dimsPatch as any);
if ("col_span" in dimsPatch || "row_span" in dimsPatch) { if ("col_span" in dimsPatch || "row_span" in dimsPatch) {
spansChanged = true;
const axis = "col_span" in dimsPatch ? "col" as const : "row" as const; const axis = "col_span" in dimsPatch ? "col" as const : "row" as const;
resolveOverlaps(deps, layoutId, cellId, axis); resolveOverlaps(deps, layoutId, cellId, axis);
} }
@ -1093,10 +1095,24 @@ export function registerAdminRoutes(app: H3, deps: AdminDeps): void {
notifyKiosks(); notifyKiosks();
if (isHtmxRequest(event)) { if (isHtmxRequest(event)) {
const cells = deps.repo.layoutCells(layoutId); if (spansChanged) {
const cells = deps.repo.layoutCells(layoutId);
const cameras = deps.repo.listCameras();
const entities = deps.repo.listEntities();
const body = String(renderGrid(layoutId, cells, entities, cameras));
return new Response(body, {
headers: {
"content-type": "text/html; charset=utf-8",
"hx-retarget": "#layout-grid",
"hx-reswap": "innerHTML",
},
});
}
const cell = deps.repo.getLayoutCellById(cellId);
if (!cell) return new Response("", { headers: { "content-type": "text/html; charset=utf-8" } });
const cameras = deps.repo.listCameras(); const cameras = deps.repo.listCameras();
const entities = deps.repo.listEntities(); const entities = deps.repo.listEntities();
return htmlFragment(renderGrid(layoutId, cells, entities, cameras)); return htmlFragment(renderCell(layoutId, cell, entities, cameras, "read"));
} }
return new Response(null, { status: 302, headers: { location: `/admin/layouts/${layoutId}` } }); return new Response(null, { status: 302, headers: { location: `/admin/layouts/${layoutId}` } });
}); });