Harden catalog admin: fix translate/quick-add, RCON sync, and confirm UX.

Restore broken Quick Add search, correct Translate saves to items_base and FurnitureData, reparent page deletes, sync RCON on create/toggle/BC mutations, and replace native confirms/prompts with dialogs.

Co-authored-by: Cursor <[email protected]>

src/actions/catalog-bc.ts

@@ -28,6 +28,7 @@ export async function updateBcPage({
 export async function deleteBcItem({ id }: { id: number }) {
 	const staff = await requirePermission(PERMS.CATALOG_EDIT);
 	await prisma.catalogItemsBc.delete({ where: { id } });
+	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
 		action: "bc_item_delete",
@@ -36,6 +37,7 @@ export async function deleteBcItem({ id }: { id: number }) {
 		targetId: id,
 	});
 	revalidatePath("/admin/catalog/builder-club");
+	return { ok: true as const };
 }
 
 export async function updateBcItem({
@@ -50,6 +52,7 @@ export async function updateBcItem({
 }) {
 	const staff = await requirePermission(PERMS.CATALOG_EDIT);
 	await prisma.catalogItemsBc.update({ where: { id }, data: data as any });
+	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
 		action: "bc_item_update",
@@ -58,6 +61,7 @@ export async function updateBcItem({
 		targetId: id,
 	});
 	revalidatePath("/admin/catalog/builder-club");
+	return { ok: true as const };
 }
 
 export async function createBcItem({
@@ -74,6 +78,7 @@ export async function createBcItem({
 	const created = await prisma.catalogItemsBc.create({
 		data: { pageId, ...data },
 	});
+	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
 		action: "bc_item_create",
@@ -82,6 +87,7 @@ export async function createBcItem({
 		targetId: created.id,
 	});
 	revalidatePath("/admin/catalog/builder-club");
+	return { ok: true as const, data: { id: created.id } };
 }
 
 export async function toggleBcPage({
@@ -96,12 +102,14 @@ export async function toggleBcPage({
 		where: { id },
 		select: { enabled: true, visible: true },
 	});
-	if (!page) return;
+	if (!page) return { ok: false as const, error: "Page not found" };
 	await prisma.catalogPagesBc.update({
 		where: { id },
 		data: { [field]: page[field] === "1" ? "0" : "1" },
 	});
+	await rcon.updateCatalog();
 	revalidatePath("/admin/catalog/builder-club");
+	return { ok: true as const };
 }
 
 export async function createBcPage(input: {
@@ -124,6 +132,7 @@ export async function createBcPage(input: {
 			pageTeaser: "",
 		},
 	});
+	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
 		action: "bc_page_create",

src/actions/catalog.ts

@@ -5,6 +5,7 @@ import { requirePermission } from "@/lib/admin/guard";
 import { PERMS } from "@/lib/permissions";
 import { prisma } from "@/lib/prisma";
 import type { ActionResult } from "@/lib/safe-action-shared";
+import { deletePage, movePage } from "@/lib/services/catalog-tree";
 import { rcon } from "@/lib/services/rcon";
 import { logStaffActivity } from "@/lib/services/staff-activity";
 
@@ -28,7 +29,7 @@ export async function updateCatalogPage({
 
 export async function deleteCatalogPage({ id }: { id: number }) {
 	const staff = await requirePermission(PERMS.CATALOG_EDIT);
-	await prisma.catalogPages.delete({ where: { id } });
+	await deletePage(id, "reparent");
 	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
@@ -60,6 +61,7 @@ export async function toggleCatalogPage({
 		where: { id },
 		data: { [field]: current === "1" ? "0" : "1" },
 	});
+	await rcon.updateCatalog();
 	revalidatePath("/admin/catalog");
 	return { ok: true as const, data: {} };
 }
@@ -95,6 +97,7 @@ export async function createCatalogPage(input: {
 			includes: "",
 		},
 	});
+	await rcon.updateCatalog();
 	await logStaffActivity({
 		staffId: staff.id,
 		action: "catalog_page_create",
@@ -112,14 +115,19 @@ export async function reorderTreePage(input: {
 	newOrderNum: number;
 }) {
 	await requirePermission(PERMS.CATALOG_EDIT);
+	if (input.newParentId !== undefined) {
+		try {
+			await movePage(input.pageId, input.newParentId);
+		} catch (err) {
+			return {
+				ok: false as const,
+				error: err instanceof Error ? err.message : "Invalid move",
+			};
+		}
+	}
 	await prisma.catalogPages.update({
 		where: { id: input.pageId },
-		data: {
+		data: { orderNum: input.newOrderNum },
-			orderNum: input.newOrderNum,
-			...(input.newParentId === undefined
-				? {}
-				: { parentId: input.newParentId }),
-		},
 	});
 	await rcon.updateCatalog();
 	revalidatePath("/admin/catalog");
@@ -131,31 +139,7 @@ export async function deleteTreePage(input: {
 	mode: "reparent" | "cascade";
 }) {
 	await requirePermission(PERMS.CATALOG_EDIT);
-	if (input.mode === "cascade") {
+	await deletePage(input.pageId, input.mode);
-		const children = await prisma.catalogPages.findMany({
-			where: { parentId: input.pageId },
-			select: { id: true },
-		});
-		const pageIds = [input.pageId, ...children.map((child) => child.id)];
-		await prisma.$transaction([
-			prisma.catalogItems.deleteMany({ where: { pageId: { in: pageIds } } }),
-			prisma.catalogPages.deleteMany({ where: { id: { in: pageIds } } }),
-		]);
-	} else {
-		const page = await prisma.catalogPages.findUnique({
-			where: { id: input.pageId },
-			select: { parentId: true },
-		});
-		if (!page) return { ok: false as const, error: "Catalog page not found" };
-		await prisma.$transaction([
-			prisma.catalogPages.updateMany({
-				where: { parentId: input.pageId },
-				data: { parentId: page.parentId },
-			}),
-			prisma.catalogItems.deleteMany({ where: { pageId: input.pageId } }),
-			prisma.catalogPages.delete({ where: { id: input.pageId } }),
-		]);
-	}
 	await rcon.updateCatalog();
 	revalidatePath("/admin/catalog");
 	return { ok: true as const, data: {} };

src/app/admin/catalog/[id]/catalog-items-table/catalog-items-table.tsx

@@ -47,6 +47,7 @@ import {
 import { BulkImportItems } from "@/components/admin/catalog/bulk-import-items";
 import { ItemsShopPreview } from "@/components/admin/catalog/items-shop-preview";
 import { QuickAddFurni } from "@/components/admin/catalog/quick-add-furni";
+import { useConfirmDialog } from "@/components/admin/confirm-dialog";
 import {
 	CurrencyIcon,
 	currencyKindFromPointsType,
@@ -60,7 +61,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -158,6 +158,7 @@ export function CatalogItemsTable({
 }: CatalogItemsTableProps) {
 	const router = useRouter();
 	const { run, isPending } = useServerAction();
+	const { confirm, dialog: confirmDialog } = useConfirmDialog();
 	const [addOpen, setAddOpen] = useState(false);
 	const [editingItem, setEditingItem] = useState<CatalogItemData | null>(null);
 	const [editingBase, setEditingBase] = useState<BaseItemData | null>(null);
@@ -378,6 +379,7 @@ export function CatalogItemsTable({
 					setSavingItemId(null);
 					router.refresh();
 				},
+				onError: () => setSavingItemId(null),
 			},
 		);
 	}
@@ -436,7 +438,12 @@ export function CatalogItemsTable({
 	// ── Bulk delete selected ─────────────────────────────────────────
 	async function handleBulkDelete() {
 		if (selected.size === 0) return;
-		if (!confirm(`Delete ${selected.size} selected item(s)?`)) return;
+		const ok = await confirm({
+			title: "Delete items",
+			description: `Delete ${selected.size} selected item(s)?`,
+			confirmLabel: "Delete",
+		});
+		if (!ok) return;
 
 		run(() => deleteCatalogItems({ ids: [...selected] }), {
 			successMessage: `Deleted ${selected.size} item(s).`,
@@ -584,7 +591,12 @@ export function CatalogItemsTable({
 	}
 
 	async function handleDeleteItem(id: number) {
-		if (!confirm("Delete this catalog item?")) return;
+		const ok = await confirm({
+			title: "Delete item",
+			description: "Delete this catalog item?",
+			confirmLabel: "Delete",
+		});
+		if (!ok) return;
 		run(() => deleteCatalogItems({ ids: [id] }), {
 			successMessage: "Item deleted.",
 			errorMessage: "Failed to delete item.",
@@ -867,6 +879,8 @@ export function CatalogItemsTable({
 	}
 
 	return (
+		<>
+			{confirmDialog}
 		<Card>
 			<CardHeader className="space-y-3">
 				<div className="flex flex-row items-center justify-between gap-4">
@@ -1009,12 +1023,10 @@ export function CatalogItemsTable({
 									onImported={() => router.refresh()}
 								/>
 								<Dialog open={addOpen} onOpenChange={setAddOpen}>
-									<DialogTrigger asChild>
+									<Button size="sm" onClick={() => setAddOpen(true)}>
-										<Button size="sm">
 										<Plus className="mr-2 h-4 w-4" />
 										Add Item
 									</Button>
-									</DialogTrigger>
 									<DialogContent className="max-h-[90vh] overflow-y-auto">
 										<DialogHeader>
 											<DialogTitle>Add Catalog Item</DialogTitle>
@@ -2302,5 +2314,6 @@ export function CatalogItemsTable({
 				</Dialog>
 			</CardContent>
 		</Card>
+		</>
 	);
 }

src/app/admin/catalog/[id]/catalog-page-form.tsx

@@ -18,6 +18,7 @@ import { deleteCatalogPage, updateCatalogPage } from "@/actions/catalog";
 import { CatalogImagePicker } from "@/components/admin/catalog/catalog-image-picker";
 import { IconPicker } from "@/components/admin/catalog/icon-picker";
 import { ImagePreview } from "@/components/admin/catalog-manager/image-preview";
+import { useConfirmDialog } from "@/components/admin/confirm-dialog";
 import { CatalogIcon, LAYOUT_COLORS } from "@/components/admin/catalog-tree";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
@@ -90,6 +91,7 @@ export function CatalogPageForm({
 	allPages,
 }: CatalogPageFormProps) {
 	const { isPending, run } = useServerAction();
+	const { confirm, dialog: confirmDialog } = useConfirmDialog();
 	const formRef = useRef<HTMLFormElement>(null);
 
 	const [form, setForm] = useState({
@@ -140,13 +142,18 @@ export function CatalogPageForm({
 		});
 	}
 
-	function handleDelete() {
+	async function handleDelete() {
 		const childCount = childPages.length;
-		const msg =
+		const description =
 			childCount > 0
-				? `Delete this catalog page? Its ${childCount} child page(s) will be moved to root. All items in this page will be deleted.`
+				? `Delete this catalog page? Its ${childCount} child page(s) will be moved to the parent. All items on this page will be deleted.`
 				: "Delete this catalog page and all its items?";
-		if (!confirm(msg)) return;
+		const ok = await confirm({
+			title: "Delete catalog page",
+			description,
+			confirmLabel: "Delete",
+		});
+		if (!ok) return;
 		run(() => deleteCatalogPage({ id: catalogPage.id }), {
 			successMessage: "Page deleted.",
 			redirectTo: "/admin/catalog",
@@ -157,6 +164,8 @@ export function CatalogPageForm({
 		LAYOUT_COLORS[form.pageLayout] || "bg-muted text-muted-foreground";
 
 	return (
+		<>
+			{confirmDialog}
 			<form ref={formRef} onSubmit={handleSubmit}>
 			<div className="grid gap-4 lg:grid-cols-3">
 				{/* ── Left column (2/3): tabs ─────────────────────────── */}
@@ -495,6 +504,7 @@ export function CatalogPageForm({
 				</div>
 			</div>
 		</form>
+		</>
 	);
 }
 

src/app/admin/catalog/builder-club/bc-manager.tsx

@@ -41,6 +41,7 @@ import {
 } from "@/components/ui/table";
 import { Textarea } from "@/components/ui/textarea";
 import { useServerAction } from "@/hooks/use-server-action";
+import { useConfirmDialog } from "@/components/admin/confirm-dialog";
 
 // ── Types ────────────────────────────────────────────────────────────
 
@@ -82,6 +83,7 @@ interface BcPageDetailProps {
 
 export function BcPageDetail({ page, items, canEdit }: BcPageDetailProps) {
 	const { isPending, run } = useServerAction();
+	const { confirm, dialog: confirmDialog } = useConfirmDialog();
 	const formRef = useRef<HTMLFormElement>(null);
 	const [editingItem, setEditingItem] = useState<BcItemData | null>(null);
 	const [addingItem, setAddingItem] = useState(false);
@@ -130,6 +132,7 @@ export function BcPageDetail({ page, items, canEdit }: BcPageDetailProps) {
 
 	return (
 		<div className="space-y-6">
+			{confirmDialog}
 			{/* Header */}
 			<div className="flex items-center gap-3">
 				<Link
@@ -338,13 +341,13 @@ export function BcPageDetail({ page, items, canEdit }: BcPageDetailProps) {
 																	variant="ghost"
 																	size="sm"
 																	className="h-6 w-6 p-0 text-[var(--admin-error)] hover:text-[var(--admin-error)]"
-																	onClick={() => {
+																	onClick={async () => {
-																		if (
+																		const ok = await confirm({
-																			!confirm(
+																			title: "Delete BC item",
-																				`Delete item "${item.catalogName}"?`,
+																			description: `Delete item "${item.catalogName}"?`,
-																			)
+																			confirmLabel: "Delete",
-																		)
+																		});
-																			return;
+																		if (!ok) return;
 																		run(() => deleteBcItem({ id: item.id }), {
 																			successMessage: "Item deleted.",
 																		});

src/app/admin/catalog/catalog-actions.tsx

@@ -11,7 +11,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
@@ -72,12 +71,10 @@ export function CatalogActions({
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
+			<Button type="button" onClick={() => setOpen(true)}>
-				<Button>
 				<Plus className="mr-2 h-4 w-4" />
 				New Page
 			</Button>
-			</DialogTrigger>
 			<DialogContent>
 				<DialogHeader>
 					<DialogTitle>

src/app/api/admin/catalog/suggest/route.ts

@@ -1,7 +1,7 @@
 import { withAdmin } from "@/lib/api-handler";
 import { apiOk } from "@/lib/api-response";
 import { PERMS } from "@/lib/permissions";
-import { lookupHabboIt } from "@/lib/services/habbo-furnidata-cache";
+import { batchLookupByClassnames } from "@/lib/services/habbofurni";
 
 export const GET = withAdmin(
 	{ permission: PERMS.CATALOG_VIEW },
@@ -13,19 +13,16 @@ export const GET = withAdmin(
 			.filter(Boolean)
 			.slice(0, 100);
 
+		const found = await batchLookupByClassnames(classnames);
 		const suggestions: Record<string, { name: string; description: string }> =
 			{};
 
-		await Promise.all(
+		for (const [classname, entry] of found) {
-			classnames.map(async (classname) => {
-				const entry = await lookupHabboIt(classname);
-				if (!entry) return;
 			suggestions[classname] = {
 				name: entry.name ?? "",
 				description: entry.description ?? "",
 			};
-			}),
+		}
-		);
 
 		return apiOk({ suggestions });
 	},

src/app/api/admin/catalog/tree/route.ts

@@ -1,5 +1,3 @@
-import { promises as fs } from "node:fs";
-import path from "node:path";
 import { withAdmin } from "@/lib/api-handler";
 import { apiError, apiOk } from "@/lib/api-response";
 import { PERMS } from "@/lib/permissions";
@@ -9,6 +7,7 @@ import {
 	getAncestors,
 	getTreeFlat,
 } from "@/lib/services/catalog-tree";
+import { rcon } from "@/lib/services/rcon";
 import type { TreeNode } from "@/types/catalog";
 
 type PageRow = {
@@ -262,6 +261,7 @@ export const PATCH = withAdmin(
 				where: { id: pageId },
 				data: { [field]: current === "1" ? "0" : "1" },
 			});
+			await rcon.updateCatalog();
 			return apiOk({});
 		}
 		const page = await prisma.catalogPages.findUnique({
@@ -274,6 +274,7 @@ export const PATCH = withAdmin(
 			where: { id: pageId },
 			data: { [field]: current === "1" ? "0" : "1" },
 		});
+		await rcon.updateCatalog();
 		return apiOk({});
 	},
 );
@@ -304,21 +305,34 @@ export const DELETE = withAdmin(
 					prisma.catalogPagesBc.delete({ where: { id: pageId } }),
 				]);
 			} else {
+				// Deep cascade: collect all descendants
+				const toDelete: number[] = [pageId];
+				const queue: number[] = [pageId];
+				while (queue.length > 0) {
 					const children = await prisma.catalogPagesBc.findMany({
-					where: { parentId: pageId },
+						where: { parentId: { in: queue } },
 						select: { id: true },
 					});
-				const ids = [pageId, ...children.map((c) => c.id)];
+					queue.length = 0;
+					for (const child of children) {
+						toDelete.push(child.id);
+						queue.push(child.id);
+					}
+				}
 				await prisma.$transaction([
 					prisma.catalogItemsBc.deleteMany({
-						where: { pageId: { in: ids } },
+						where: { pageId: { in: toDelete } },
+					}),
+					prisma.catalogPagesBc.deleteMany({
+						where: { id: { in: toDelete } },
 					}),
-					prisma.catalogPagesBc.deleteMany({ where: { id: { in: ids } } }),
 				]);
 			}
+			await rcon.updateCatalog();
 			return apiOk({});
 		}
 		await deletePage(pageId, mode);
+		await rcon.updateCatalog();
 		return apiOk({});
 	},
 );

src/app/api/admin/furni/search/route.ts

@@ -0,0 +1,59 @@
+import { withAdmin } from "@/lib/api-handler";
+import { apiOk } from "@/lib/api-response";
+import { PERMS } from "@/lib/permissions";
+import { prisma } from "@/lib/prisma";
+
+/**
+ * Search items_base for Quick Add / catalog tooling.
+ * GET ?q=…&limit=30
+ */
+export const GET = withAdmin(
+	{ permission: PERMS.CATALOG_VIEW },
+	async (request) => {
+		const q = (request.nextUrl.searchParams.get("q") || "").trim();
+		const limit = Math.min(
+			Math.max(
+				Number.parseInt(request.nextUrl.searchParams.get("limit") || "30", 10) ||
+					30,
+				1,
+			),
+			50,
+		);
+
+		if (q.length < 2) {
+			return apiOk({ results: [] });
+		}
+
+		const idExact = Number.parseInt(q, 10);
+		const rows = await prisma.itemsBase.findMany({
+			where: {
+				OR: [
+					{ itemName: { contains: q } },
+					{ publicName: { contains: q } },
+					...(Number.isFinite(idExact) && String(idExact) === q
+						? [{ id: idExact }]
+						: []),
+				],
+			},
+			select: {
+				id: true,
+				itemName: true,
+				publicName: true,
+				type: true,
+				spriteId: true,
+			},
+			take: limit,
+			orderBy: { id: "asc" },
+		});
+
+		return apiOk({
+			results: rows.map((r) => ({
+				id: r.id,
+				itemName: r.itemName ?? "",
+				publicName: r.publicName ?? "",
+				type: r.type ?? "s",
+				spriteId: r.spriteId ?? 0,
+			})),
+		});
+	},
+);

src/components/admin/catalog-manager/root-tabs.tsx

@@ -25,6 +25,7 @@ import {
 	reorderTreePage,
 	toggleCatalogPage,
 } from "@/actions/catalog";
+import { useConfirmDialog } from "@/components/admin/confirm-dialog";
 import { CatalogIcon } from "@/components/admin/catalog-tree";
 import { Button } from "@/components/ui/button";
 import {
@@ -48,8 +49,8 @@ import type { RootTab } from "@/types/catalog";
 interface RootTabsProps {
 	tabs: RootTab[];
 	activeTabId: number | null;
-	onTabClick: (id: number) => void;
+	onTabClick: (id: number) => void | Promise<void>;
-	onEditTab: (id: number) => void;
+	onEditTab: (id: number) => void | Promise<void>;
 	onCreateRoot: () => void;
 	loading?: boolean;
 }
@@ -62,6 +63,7 @@ export function RootTabs({
 	onCreateRoot,
 	loading,
 }: RootTabsProps) {
+	const { confirm, dialog: confirmDialog } = useConfirmDialog();
 	const [activeDragId, setActiveDragId] = useState<number | null>(null);
 	const sensors = useSensors(
 		useSensor(PointerSensor, { activationConstraint: { distance: 8 } }),
@@ -112,12 +114,12 @@ export function RootTabs({
 	};
 
 	const handleDelete = async (tab: RootTab) => {
-		if (
+		const ok = await confirm({
-			!confirm(
+			title: "Delete root page",
-				`Delete root page "${tab.caption}"? Children will be reparented.`,
+			description: `Delete root page "${tab.caption}"? Children will be reparented.`,
-			)
+			confirmLabel: "Delete",
-		)
+		});
-			return;
+		if (!ok) return;
 		try {
 			await deleteTreePage({ pageId: tab.id, mode: "reparent" });
 			toast.success(`"${tab.caption}" deleted`);
@@ -132,6 +134,7 @@ export function RootTabs({
 
 	return (
 		<div className="flex items-center gap-1 border-b bg-muted/30 px-2 py-1.5 overflow-x-auto shrink-0">
+			{confirmDialog}
 			{loading && (
 				<Loader2 className="h-4 w-4 animate-spin text-muted-foreground mx-2" />
 			)}

src/components/admin/catalog-tree.tsx

@@ -32,6 +32,7 @@ import {
 	useState,
 } from "react";
 import { toast } from "sonner";
+import { useConfirmDialog } from "@/components/admin/confirm-dialog";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import {
@@ -173,6 +174,7 @@ export function CatalogTree({
 	catalogType = "normal",
 }: CatalogTreeProps) {
 	const router = useRouter();
+	const { confirm, dialog: confirmDialog } = useConfirmDialog();
 	const [searchQuery, setSearchQuery] = useState("");
 	const [searchResults, setSearchResults] = useState<TreeNode[] | null>(null);
 	const [searching, setSearching] = useState(false);
@@ -280,7 +282,12 @@ export function CatalogTree({
 					: "";
 			const itemInfo =
 				node.itemCount > 0 ? ` ${node.itemCount} item(s) will be deleted.` : "";
-			if (!confirm(`Delete "${node.caption}"?${childInfo}${itemInfo}`)) return;
+			const ok = await confirm({
+				title: "Delete page",
+				description: `Delete "${node.caption}"?${childInfo}${itemInfo}`,
+				confirmLabel: "Delete",
+			});
+			if (!ok) return;
 
 			try {
 				const res = await fetch(
@@ -296,7 +303,7 @@ export function CatalogTree({
 				toast.error("Failed to delete page.");
 			}
 		},
-		[router, catParam],
+		[router, catParam, confirm],
 	);
 
 	const unfilteredPages = searchResults ?? rootPages;
@@ -320,6 +327,7 @@ export function CatalogTree({
 				catalogType,
 			}}
 		>
+			{confirmDialog}
 			<TooltipProvider delayDuration={400}>
 				<div className="rounded-lg border bg-card shadow-sm">
 					{/* Header */}

src/components/admin/catalog/bulk-import-items.tsx

@@ -11,7 +11,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Label } from "@/components/ui/label";
 import { Textarea } from "@/components/ui/textarea";
@@ -134,12 +133,10 @@ export function BulkImportItems({ pageId, onImported }: BulkImportItemsProps) {
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
+			<Button variant="outline" size="sm" onClick={() => setOpen(true)}>
-				<Button variant="outline" size="sm">
 				<Upload className="mr-2 h-4 w-4" />
 				Bulk Import
 			</Button>
-			</DialogTrigger>
 			<DialogContent className="max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Bulk Import Items</DialogTitle>

src/components/admin/catalog/catalog-image-picker.tsx

@@ -9,7 +9,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
@@ -106,12 +105,12 @@ export function CatalogImagePicker({
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
 			<Button
 				type="button"
 				variant="outline"
 				disabled={disabled}
 				className="h-auto w-full justify-start gap-2 px-3 py-2"
+				onClick={() => setOpen(true)}
 			>
 				{value ? (
 					<CatalogImageThumb name={value} size={40} />
@@ -134,7 +133,6 @@ export function CatalogImagePicker({
 					</p>
 				</div>
 			</Button>
-			</DialogTrigger>
 			<DialogContent className="max-w-4xl">
 				<DialogHeader>
 					<DialogTitle>

src/components/admin/catalog/icon-picker.tsx

@@ -9,7 +9,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { cn } from "@/lib/utils";
@@ -103,13 +102,22 @@ export function IconPicker({
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
+			{children ? (
-				{children ?? (
+				<button
+					type="button"
+					disabled={disabled}
+					onClick={() => setOpen(true)}
+					className="contents"
+				>
+					{children}
+				</button>
+			) : (
 				<Button
 					type="button"
 					variant="outline"
 					disabled={disabled}
 					className="h-auto gap-2 px-3 py-2"
+					onClick={() => setOpen(true)}
 				>
 					<IconPreview iconImage={value} size={24} />
 					<span className="font-mono text-xs text-muted-foreground">
@@ -117,7 +125,6 @@ export function IconPicker({
 					</span>
 				</Button>
 			)}
-			</DialogTrigger>
 			<DialogContent className="max-w-3xl">
 				<DialogHeader>
 					<DialogTitle>Select Catalog Icon</DialogTitle>

src/components/admin/catalog/quick-add-furni.tsx

@@ -10,7 +10,6 @@ import {
 	DialogContent,
 	DialogHeader,
 	DialogTitle,
-	DialogTrigger,
 } from "@/components/ui/dialog";
 import { Input } from "@/components/ui/input";
 import { useServerAction } from "@/hooks/use-server-action";
@@ -122,15 +121,13 @@ export function QuickAddFurni({
 
 	return (
 		<Dialog open={open} onOpenChange={setOpen}>
-			<DialogTrigger asChild>
+			<Button variant="outline" size="sm" onClick={() => setOpen(true)}>
-				<Button variant="outline" size="sm">
 				<Zap className="mr-2 h-4 w-4" />
 				Quick Add
 				<kbd className="ml-2 hidden rounded border bg-muted px-1 text-[10px] sm:inline">
 					Ctrl+K
 				</kbd>
 			</Button>
-			</DialogTrigger>
 			<DialogContent className="max-w-2xl">
 				<DialogHeader>
 					<DialogTitle>Quick Add Furni</DialogTitle>

src/hooks/use-server-action.ts

@@ -17,6 +17,8 @@ interface RunOptions {
 	redirectTo?: string;
 	/** Called on success with the result data. Overrides default router.refresh(). */
 	onSuccess?: (data: Record<string, unknown>) => void;
+	/** Called when the action fails or throws */
+	onError?: () => void;
 }
 
 /**
@@ -42,6 +44,7 @@ export function useServerAction(options: UseServerActionOptions = {}) {
 			errorMessage = "An error occurred.",
 			redirectTo,
 			onSuccess,
+			onError,
 		} = opts;
 
 		startTransition(async () => {
@@ -59,10 +62,12 @@ export function useServerAction(options: UseServerActionOptions = {}) {
 					}
 				} else {
 					toast.error(result.error || errorMessage);
+					onError?.();
 				}
 			} catch (err) {
 				console.error("[useServerAction] Unexpected error:", err);
 				toast.error(errorMessage);
+				onError?.();
 			}
 		});
 	}

src/lib/services/furni-data.ts

@@ -245,6 +245,65 @@ export async function removeFurniEntry(classname: string): Promise<boolean> {
 	});
 }
 
+/**
+ * Patch name/description on existing FurnitureData entries by classname.
+ * Optionally creates a minimal entry when missing.
+ */
+export async function patchFurniEntryNames(
+	updates: Array<{
+		classname: string;
+		itemType: string;
+		name?: string;
+		description?: string;
+		spriteId?: number;
+		createIfMissing?: boolean;
+	}>,
+): Promise<{ updated: number; inserted: number }> {
+	if (updates.length === 0) return { updated: 0, inserted: 0 };
+
+	return withFurniDataLock(async () => {
+		const furniData = (await readFurniData()) as Record<
+			string,
+			{ furnitype: Array<Record<string, unknown>> }
+		>;
+		let updated = 0;
+		let inserted = 0;
+
+		for (const u of updates) {
+			const sectionKey = u.itemType === "i" ? "wallitemtypes" : "roomitemtypes";
+			if (!furniData[sectionKey]) furniData[sectionKey] = { furnitype: [] };
+			const section = furniData[sectionKey];
+			const idx = section.furnitype.findIndex(
+				(e) => e.classname === u.classname,
+			);
+
+			if (idx >= 0) {
+				const entry = { ...section.furnitype[idx] };
+				if (u.name !== undefined) entry.name = u.name;
+				if (u.description !== undefined) entry.description = u.description;
+				section.furnitype[idx] = entry;
+				updated++;
+			} else if (u.createIfMissing) {
+				section.furnitype.push({
+					id: u.spriteId ?? 0,
+					classname: u.classname,
+					revision: 0,
+					category: "unknown",
+					name: u.name ?? u.classname,
+					description: u.description ?? "",
+					offerid: u.spriteId ?? -1,
+				});
+				inserted++;
+			}
+		}
+
+		if (updated > 0 || inserted > 0) {
+			await writeFurniData(furniData as Record<string, unknown>);
+		}
+		return { updated, inserted };
+	});
+}
+
 export async function appendFurniEntriesBatch(
 	entries: Array<{ entry: Record<string, unknown>; itemType: string }>,
 ): Promise<void> {