fix: address bulk block review comments

apps/api/src/routes/admin-bulk-block.spec.ts

@@ -4,12 +4,10 @@ import { app } from "@/index.js";
 import { createTestUser, deleteAll } from "@/testing.js";
 
 import { db, tables } from "@llmgateway/db";
+import { MAX_BULK_BLOCK_ORGANIZATIONS } from "@llmgateway/shared";
 
 const originalAdminEmails = process.env.ADMIN_EMAILS;
 
-// Mirrors MAX_BULK_BLOCK_ORGANIZATIONS in apps/api/src/routes/admin.ts.
-const MAX_BULK_BLOCK_ORGANIZATIONS = 500;
-
 interface PreviewResponse {
 	search: string;
 	matched: number;

apps/api/src/routes/admin.ts

@@ -66,6 +66,8 @@ import {
 	type DevPlanTier,
 	getDevPlanPremiumWeeklyLimit,
 	getIncludedResetPassesRemaining,
+	MAX_BULK_BLOCK_ORGANIZATIONS,
+	MIN_BULK_BLOCK_SEARCH_LENGTH,
 } from "@llmgateway/shared";
 import {
 	getResendClient,
@@ -6248,14 +6250,6 @@ admin.openapi(blockOrganizationRoute, async (c) => {
 
 // --- Bulk block organizations (filtered list) ---
 
-// Hard ceiling on a single bulk block. A filter matching more than this is
-// treated as too broad to be an intentional selection and is rejected outright
-// rather than partially applied.
-const MAX_BULK_BLOCK_ORGANIZATIONS = 500;
-// A one or two character filter matches far too much to be a deliberate
-// selection, so require something specific enough to identify a set of orgs.
-const MIN_BULK_BLOCK_SEARCH_LENGTH = 3;
-
 const bulkBlockOrganizationSchema = z.object({
 	id: z.string(),
 	name: z.string(),

ee/admin/src/app/organizations/page.tsx

@@ -32,6 +32,8 @@ import { requireSession } from "@/lib/require-session";
 import { createServerApiClient } from "@/lib/server-api";
 import { cn } from "@/lib/utils";
 
+import { MIN_BULK_BLOCK_SEARCH_LENGTH } from "@llmgateway/shared";
+
 type SortBy =
 	| "name"
 	| "billingEmail"
@@ -44,11 +46,6 @@ type SortBy =
 	| "totalSpent";
 type SortOrder = "asc" | "desc";
 
-// Mirrors MIN_BULK_BLOCK_SEARCH_LENGTH in apps/api/src/routes/admin.ts. The
-// server rejects anything shorter; this only hides the entry point so the
-// action never looks available for an empty or near-empty filter.
-const BULK_BLOCK_MIN_SEARCH_LENGTH = 3;
-
 function SortableHeader({
 	label,
 	sortKey,
@@ -252,15 +249,15 @@ export default async function OrganizationsPage({
 				</form>
 			</header>
 
-			{search.trim().length >= BULK_BLOCK_MIN_SEARCH_LENGTH && (
+			{search.trim().length >= MIN_BULK_BLOCK_SEARCH_LENGTH && (
 				<div className="flex flex-col items-start gap-2 rounded-lg border border-destructive/30 bg-destructive/5 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
 					<p className="text-sm text-muted-foreground">
 						Bulk actions apply to every organization matching the current
 						filter, not just this page.
 					</p>
 					<BulkBlockOrgsButton
 						search={search}
-						minSearchLength={BULK_BLOCK_MIN_SEARCH_LENGTH}
+						minSearchLength={MIN_BULK_BLOCK_SEARCH_LENGTH}
 						onPreview={handlePreviewBulkBlock}
 						onBulkBlock={handleBulkBlock}
 					/>

ee/admin/src/components/bulk-block-orgs-button.tsx

@@ -53,7 +53,10 @@ export function BulkBlockOrgsButton({
 	const [preview, setPreview] = useState<BulkBlockPreview | null>(null);
 	const [confirmation, setConfirmation] = useState("");
 	const [blocking, setBlocking] = useState(false);
-	const [error, setError] = useState<string | null>(null);
+	// Preview and block failures are tracked separately: a failed block re-resolves
+	// the preview, and that reload must not clear the block error it accompanies.
+	const [previewError, setPreviewError] = useState<string | null>(null);
+	const [blockError, setBlockError] = useState<string | null>(null);
 	const [result, setResult] = useState<BulkBlockResult | null>(null);
 
 	const trimmedSearch = search.trim();
@@ -62,47 +65,68 @@ export function BulkBlockOrgsButton({
 	const resetState = () => {
 		setPreview(null);
 		setConfirmation("");
-		setError(null);
+		setPreviewError(null);
+		setBlockError(null);
 		setResult(null);
 		setPreviewLoading(false);
 	};
 
+	const loadPreview = async () => {
+		setPreview(null);
+		setConfirmation("");
+		setPreviewError(null);
+		setPreviewLoading(true);
+		try {
+			const response = await onPreview(trimmedSearch);
+			if (response.success && response.preview) {
+				setPreview(response.preview);
+			} else {
+				setPreviewError(response.error ?? "Failed to preview bulk block");
+			}
+		} catch (err) {
+			setPreviewError(
+				err instanceof Error ? err.message : "Failed to preview bulk block",
+			);
+		} finally {
+			setPreviewLoading(false);
+		}
+	};
+
 	const handleOpen = async () => {
 		resetState();
 		setOpen(true);
-		setPreviewLoading(true);
-		const response = await onPreview(trimmedSearch);
-		setPreviewLoading(false);
-		if (response.success && response.preview) {
-			setPreview(response.preview);
-		} else {
-			setError(response.error ?? "Failed to preview bulk block");
-		}
+		await loadPreview();
 	};
 
 	const handleConfirm = async () => {
 		if (!preview) {
 			return;
 		}
 		setBlocking(true);
-		setError(null);
+		setBlockError(null);
 		try {
 			const response = await onBulkBlock(preview.search, preview.blockable);
-			setResult(response);
 			if (response.success) {
+				setResult(response);
 				router.refresh();
-			} else {
-				setError(response.error ?? "Failed to bulk block organizations");
+				return;
 			}
+			setBlockError(response.error ?? "Failed to bulk block organizations");
 		} catch (err) {
-			setError(
+			setBlockError(
 				err instanceof Error
 					? err.message
 					: "Failed to bulk block organizations",
 			);
 		} finally {
 			setBlocking(false);
 		}
+		// Only reached when the block failed — the success path returns above. The
+		// dialog stays on the confirmation step instead of showing a summary, and
+		// re-resolving the set makes the admin confirm against current numbers
+		// rather than resubmitting a stale one. This also covers a thrown request:
+		// it may still have been applied server-side before the connection failed.
+		await loadPreview();
 	};
 
 	// The admin has to retype the exact number of organizations the server
@@ -251,10 +275,15 @@ export function BulkBlockOrgsButton({
 						</div>
 					)}
 
-					{error && (
-						<p className="text-sm text-destructive" role="alert">
-							{error}
-						</p>
+					{(blockError || previewError) && (
+						<div className="space-y-1" role="alert">
+							{blockError && (
+								<p className="text-sm text-destructive">{blockError}</p>
+							)}
+							{previewError && (
+								<p className="text-sm text-destructive">{previewError}</p>
+							)}
+						</div>
 					)}
 
 					<DialogFooter>

packages/shared/src/bulk-block.ts

@@ -0,0 +1,13 @@
+// Limits for the admin "bulk block organizations" action. Shared so the admin
+// dashboard gates on the same numbers the API enforces — the API is the only
+// thing that actually protects the data, and a UI copy that drifts from it
+// would show or hide the action for filters the server disagrees about.
+
+// A one or two character filter matches far too much to be a deliberate
+// selection, so require something specific enough to identify a set of orgs.
+export const MIN_BULK_BLOCK_SEARCH_LENGTH = 3;
+
+// Hard ceiling on a single bulk block. A filter matching more than this is
+// treated as too broad to be an intentional selection and is rejected outright
+// rather than partially applied.
+export const MAX_BULK_BLOCK_ORGANIZATIONS = 500;

packages/shared/src/index.ts

@@ -143,6 +143,11 @@ export { MARKETING_STATS, RUNWARE_PROMO } from "./marketing.js";
 
 export { isContentFilterErrorText } from "./content-filter.js";
 
+export {
+	MAX_BULK_BLOCK_ORGANIZATIONS,
+	MIN_BULK_BLOCK_SEARCH_LENGTH,
+} from "./bulk-block.js";
+
 export {
 	CUSTOM_PROVIDER_NAME_MESSAGE,
 	CUSTOM_PROVIDER_NAME_REGEX,