refactor(catalog): unify commands and embed guarded catalog workspace

src/app/admin/catalog/page.tsx

@@ -15,8 +15,11 @@ import { Store } from "lucide-react";
 import { redirect } from "next/navigation";
 import { getTranslations } from "next-intl/server";
 import { AdminPageShell } from "@/components/admin/admin-page-shell";
-import { CatalogFixAllButton } from "@/components/admin/catalog/catalog-fix-all-button";
 import { CatalogTree } from "@/components/admin/catalog-tree";
+import Link from "@/components/link";
+import { CatalogSearch } from "@/features/catalog/components/catalog-search";
+import { CatalogSyncStatus } from "@/features/catalog/components/catalog-sync-status";
+import { loadCatalogOverview } from "@/features/catalog/server/overview";
 import { calcPagination, parseListParams } from "@/lib/admin-helpers";
 import {
 	CatalogItems,
@@ -28,7 +31,10 @@ import {
 import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
 import { getCatalogItemCounts } from "@/lib/services/catalog-tree";
 import { CatalogActions } from "./catalog-actions";
-import { CatalogManagerDialog } from "./catalog-manager-dialog-wrapper";
+import {
+	CatalogManagerDialog,
+	CatalogManagerWorkspace,
+} from "./catalog-manager-dialog-wrapper";
 import { CatalogTable } from "./catalog-table";
 import { CatalogViewToggle } from "./catalog-view-toggle";
 
@@ -56,8 +62,44 @@ export default async function CatalogPagesPage({
 	const params = await searchParams;
 	const sp = new URLSearchParams(params);
 	const { search, perPage, page, sort, order } = parseListParams(sp);
-	const viewMode = sp.get("view") || "tree";
-	const catalogType = sp.get("catalog") || "normal";
+	const requestedView = sp.get("view");
+	const viewMode =
+		requestedView === "tree" || requestedView === "table"
+			? requestedView
+			: "manager";
+	const catalogType = sp.get("catalog") === "bc" ? "bc" : "normal";
+	if (viewMode === "manager") {
+		const overview = await loadCatalogOverview(catalogType);
+		return (
+			<AdminPageShell icon={Store} title={t("title")} subtitle={t("subtitle")}>
+				<div className="flex flex-wrap items-center justify-between gap-3 mb-4">
+					<CatalogViewToggle currentView={viewMode} catalogType={catalogType} />
+					<div className="flex flex-wrap items-center gap-2">
+						<Link className="btn btn-outline" href="/admin/catalog/maintenance">
+							{t("workspace.diagnostics")}
+						</Link>
+						{canEdit && (
+							<CatalogActions
+								catalogType={catalogType}
+								initialParentId={sp.get("newPageParent")}
+							/>
+						)}
+					</div>
+				</div>
+				<div className="mb-3">
+					<CatalogSyncStatus canEdit={canEdit} />
+					<CatalogSearch catalogType={catalogType} />
+				</div>
+				<CatalogManagerWorkspace
+					key={catalogType}
+					catalogType={catalogType}
+					canEdit={canEdit}
+					initialRoots={overview.roots}
+					totals={overview.totals}
+				/>
+			</AdminPageShell>
+		);
+	}
 
 	type TreeNodeShape = {
 		id: number;
@@ -94,7 +136,7 @@ export default async function CatalogPagesPage({
 				.where(
 					or(eq(CatalogPagesBc.parentId, -1), eq(CatalogPagesBc.parentId, 0)),
 				)
-				.orderBy(asc(CatalogPagesBc.orderNum));
+				.orderBy(asc(CatalogPagesBc.orderNum), asc(CatalogPagesBc.id));
 			const bcRootIds = bcRootRaw.map((p) => p.id);
 			const [bcChildCounts, bcItemCounts] = await Promise.all([
 				bcRootIds.length > 0
@@ -290,7 +332,12 @@ export default async function CatalogPagesPage({
 									initialParentId={sp.get("newPageParent")}
 								/>
 							)}
-							<CatalogFixAllButton />
+							<Link
+								className="btn btn-outline"
+								href="/admin/catalog/maintenance"
+							>
+								{t("workspace.diagnostics")}
+							</Link>
 						</div>
 					</div>
 					{viewMode === "tree" ? (
@@ -323,7 +370,7 @@ export default async function CatalogPagesPage({
 		.select()
 		.from(CatalogPages)
 		.where(or(eq(CatalogPages.parentId, -1), eq(CatalogPages.parentId, 0)))
-		.orderBy(asc(CatalogPages.orderNum));
+		.orderBy(asc(CatalogPages.orderNum), asc(CatalogPages.id));
 	const rootIds = rootPagesRaw.map((p) => p.id);
 	const [rootChildCounts, rootItemCountMap] = await Promise.all([
 		rootIds.length > 0
@@ -511,7 +558,9 @@ export default async function CatalogPagesPage({
 						{canEdit && (
 							<CatalogActions initialParentId={sp.get("newPageParent")} />
 						)}
-						<CatalogFixAllButton />
+						<Link className="btn btn-outline" href="/admin/catalog/maintenance">
+							{t("workspace.diagnostics")}
+						</Link>
 					</div>
 				</div>