Revert "feat: cache purge API (object cache + native Workers Caching)" (#2281)

Reverts e886554 (#2275), which was merged before maintainer approval.

Author: scottbuscemi

.changeset/object-cache-purge-api.md

@@ -282,7 +282,6 @@ export const CAPABILITY_LABELS: Record<string, MessageDescriptor> = {
 	"media:read": msg`Access your media library`,
 	"media:write": msg`Upload and manage media`,
 	"users:read": msg`Read user accounts`,
-	"cache:purge": msg`Clear the CMS object cache and Workers Cache`,
 	"network:request": msg`Make network requests`,
 	"network:request:unrestricted": msg`Make network requests to any host (unrestricted)`,
 	// Legacy aliases (still emitted by older installed manifests)

packages/admin/src/lib/api/marketplace.ts

@@ -312,7 +312,6 @@ describe("CAPABILITY_LABELS", () => {
 			"media:read",
 			"media:write",
 			"users:read",
-			"cache:purge",
 			"network:request",
 			"network:request:unrestricted",
 			// Legacy aliases

packages/admin/tests/lib/marketplace.test.ts

@@ -246,8 +246,6 @@ function button(
 		style?: "primary" | "danger" | "secondary";
 		value?: unknown;
 		confirm?: ConfirmDialog;
-		disabled?: boolean;
-		title?: string;
 	},
 ): ButtonElement {
 	return {
@@ -257,8 +255,6 @@ function button(
 		...(opts?.style !== undefined && { style: opts.style }),
 		...(opts?.value !== undefined && { value: opts.value }),
 		...(opts?.confirm !== undefined && { confirm: opts.confirm }),
-		...(opts?.disabled !== undefined && { disabled: opts.disabled }),
-		...(opts?.title !== undefined && { title: opts.title }),
 	};
 }
 

packages/blocks/src/builders.ts

@@ -1,4 +1,4 @@
-import { Button, Dialog, DialogRoot, Tooltip, TooltipProvider } from "@cloudflare/kumo";
+import { Button, Dialog, DialogRoot } from "@cloudflare/kumo";
 import { useCallback, useState } from "react";
 
 import type { BlockInteraction, ButtonElement } from "../types.js";
@@ -11,26 +11,22 @@ export function ButtonElementComponent({
 	onAction: (interaction: BlockInteraction) => void;
 }) {
 	const [confirmOpen, setConfirmOpen] = useState(false);
-	const isDisabled = element.disabled === true;
-	const hasTitle = element.title !== undefined && element.title.length > 0;
 
 	const fireAction = useCallback(() => {
-		if (isDisabled) return;
 		onAction({
 			type: "block_action",
 			action_id: element.action_id,
 			value: element.value,
 		});
-	}, [onAction, isDisabled, element.action_id, element.value]);
+	}, [onAction, element.action_id, element.value]);
 
 	const handleClick = useCallback(() => {
-		if (isDisabled) return;
 		if (element.confirm) {
 			setConfirmOpen(true);
 		} else {
 			fireAction();
 		}
-	}, [isDisabled, element.confirm, fireAction]);
+	}, [element.confirm, fireAction]);
 
 	const handleConfirm = useCallback(() => {
 		setConfirmOpen(false);
@@ -44,35 +40,12 @@ export function ButtonElementComponent({
 				? ("destructive" as const)
 				: ("secondary" as const);
 
-	// Don't pass `title` into Kumo Button when disabled — that attaches the
-	// tooltip trigger to the disabled <button>, which never receives hover.
-	// Instead wrap a span (always hoverable) as the Tooltip trigger.
-	const button = (
-		<Button variant={variant} onClick={handleClick} disabled={isDisabled}>
-			{element.label}
-		</Button>
-	);
-
-	const withTooltip = hasTitle ? (
-		<TooltipProvider>
-			<Tooltip
-				content={element.title}
-				delay={200}
-				closeDelay={0}
-				// Span keeps pointer events when the inner button is disabled.
-				render={<span className="inline-flex max-w-max" />}
-			>
-				{button}
-			</Tooltip>
-		</TooltipProvider>
-	) : (
-		button
-	);
-
 	return (
 		<>
-			{withTooltip}
-			{element.confirm && !isDisabled && (
+			<Button variant={variant} onClick={handleClick}>
+				{element.label}
+			</Button>
+			{element.confirm && (
 				<DialogRoot open={confirmOpen} onOpenChange={setConfirmOpen}>
 					<Dialog>
 						<h3 className="text-lg font-semibold text-kumo-default">{element.confirm.title}</h3>

packages/blocks/src/elements/button.tsx

@@ -17,10 +17,6 @@ export interface ButtonElement {
 	style?: "primary" | "danger" | "secondary";
 	value?: unknown;
 	confirm?: ConfirmDialog;
-	/** When true, the button does not fire actions. */
-	disabled?: boolean;
-	/** Native tooltip shown on hover (e.g. why the button is disabled). */
-	title?: string;
 }
 
 export interface TextInputElement {

packages/blocks/src/types.ts

@@ -176,18 +176,6 @@ function validateElement(value: unknown, path: string, errors: ValidationError[]
 					message: `Field 'style' must be one of: ${[...BUTTON_STYLES].join(", ")}`,
 				});
 			}
-			if (value.disabled !== undefined && typeof value.disabled !== "boolean") {
-				errors.push({
-					path: `${path}.disabled`,
-					message: "Field 'disabled' must be a boolean",
-				});
-			}
-			if (value.title !== undefined && typeof value.title !== "string") {
-				errors.push({
-					path: `${path}.title`,
-					message: "Field 'title' must be a string",
-				});
-			}
 			if (value.confirm !== undefined) {
 				validateConfirmDialog(value.confirm, `${path}.confirm`, errors);
 			}

packages/blocks/src/validation.ts

@@ -15,28 +15,11 @@ const CollapsibleContext = React.createContext<{
 }>({});
 
 vi.mock("@cloudflare/kumo", () => ({
-	Button: ({ children, onClick, variant, type, disabled, title }: any) => (
-		<button
-			onClick={onClick}
-			data-variant={variant}
-			type={type || "button"}
-			disabled={disabled}
-			title={typeof title === "string" ? title : undefined}
-		>
+	Button: ({ children, onClick, variant, type }: any) => (
+		<button onClick={onClick} data-variant={variant} type={type || "button"}>
 			{children}
 		</button>
 	),
-	TooltipProvider: ({ children }: any) => <>{children}</>,
-	Tooltip: ({ content, children, render: triggerRender }: any) => {
-		const trigger = triggerRender ?? <span />;
-		return (
-			<div data-testid="tooltip" data-content={content}>
-				{React.isValidElement(trigger)
-					? React.cloneElement(trigger as React.ReactElement<any>, {}, children)
-					: children}
-			</div>
-		);
-	},
 	Badge: ({ children }: any) => <span data-testid="badge">{children}</span>,
 	Input: ({ label, value, defaultValue, onChange, onBlur, placeholder, type, min, max }: any) => (
 		<div>
@@ -410,34 +393,6 @@ describe("BlockRenderer", () => {
 		expect(screen.getByText("Cancel")).toBeTruthy();
 	});
 
-	it("disabled button with title wraps a tooltip and does not fire actions", () => {
-		const onAction = vi.fn();
-		renderBlocks(
-			[
-				{
-					type: "actions",
-					elements: [
-						{
-							type: "button",
-							action_id: "clear",
-							label: "Clear object cache",
-							disabled: true,
-							title: "Object Cache Not Configured",
-						},
-					],
-				},
-			],
-			onAction,
-		);
-		const btn = screen.getByText("Clear object cache") as HTMLButtonElement;
-		expect(btn.disabled).toBe(true);
-		expect(screen.getByTestId("tooltip").getAttribute("data-content")).toBe(
-			"Object Cache Not Configured",
-		);
-		fireEvent.click(btn);
-		expect(onAction).not.toHaveBeenCalled();
-	});
-
 	it("stats block renders stat cards with values", () => {
 		renderBlocks([
 			{

packages/blocks/tests/renderer.test.tsx

@@ -10,14 +10,7 @@
 import type { D1Database } from "@cloudflare/workers-types";
 import { WorkerEntrypoint } from "cloudflare:workers";
 import type { SandboxEmailSendCallback } from "emdash";
-import {
-	handleObjectCachePurge,
-	handleObjectCacheStatus,
-	handleWorkersCachePurge,
-	handleWorkersCacheStatus,
-	ulid,
-	PluginStorageRepository,
-} from "emdash";
+import { ulid, PluginStorageRepository } from "emdash";
 import { Kysely } from "kysely";
 import { D1Dialect } from "kysely-d1";
 
@@ -1180,70 +1173,6 @@ export class PluginBridge extends WorkerEntrypoint<PluginBridgeEnv, PluginBridge
 		await emailSendCallback(message, pluginId);
 	}
 
-	// =========================================================================
-	// Object cache — capability-gated (cache:purge)
-	// =========================================================================
-
-	async getObjectCacheStatus(): Promise<{ configured: boolean }> {
-		const { capabilities } = this.ctx.props;
-		if (!capabilities.includes("cache:purge")) {
-			throw new Error("Missing capability: cache:purge");
-		}
-		const result = await handleObjectCacheStatus();
-		if (!result.success) {
-			throw new Error(result.error.message);
-		}
-		return result.data;
-	}
-
-	async purgeObjectCache(options?: {
-		namespaces?: string[];
-	}): Promise<{ configured: boolean; active: boolean; purged: string[] }> {
-		const { capabilities } = this.ctx.props;
-		if (!capabilities.includes("cache:purge")) {
-			throw new Error("Missing capability: cache:purge");
-		}
-		const db = new Kysely<unknown>({
-			dialect: new D1Dialect({ database: this.env.DB }),
-		});
-		// eslint-disable-next-line typescript-eslint/no-unsafe-type-assertion -- D1 dialect matches core handler db shape
-		const result = await handleObjectCachePurge(db as never, {
-			namespaces: options?.namespaces,
-		});
-		if (!result.success) {
-			throw new Error(result.error.message);
-		}
-		return result.data;
-	}
-
-	async getWorkersCacheStatus(): Promise<{ configured: boolean }> {
-		const { capabilities } = this.ctx.props;
-		if (!capabilities.includes("cache:purge")) {
-			throw new Error("Missing capability: cache:purge");
-		}
-		const result = await handleWorkersCacheStatus();
-		if (!result.success) {
-			throw new Error(result.error.message);
-		}
-		return result.data;
-	}
-
-	async purgeWorkersCache(options?: {
-		pathPrefixes?: string[];
-	}): Promise<{ configured: boolean; purged: boolean; pathPrefixes?: string[] }> {
-		const { capabilities } = this.ctx.props;
-		if (!capabilities.includes("cache:purge")) {
-			throw new Error("Missing capability: cache:purge");
-		}
-		const result = await handleWorkersCachePurge({
-			pathPrefixes: options?.pathPrefixes,
-		});
-		if (!result.success) {
-			throw new Error(result.error.message);
-		}
-		return result.data;
-	}
-
 	// =========================================================================
 	// Logging
 	// =========================================================================

packages/cloudflare/src/sandbox/bridge.ts

@@ -212,15 +212,6 @@ export interface PluginBridgeBinding {
 	): Promise<{ status: number; headers: Record<string, string>; text: string }>;
 	// Email
 	emailSend(message: { to: string; subject: string; text: string; html?: string }): Promise<void>;
-	// Cache purge (gated on cache:purge)
-	getObjectCacheStatus(): Promise<{ configured: boolean }>;
-	purgeObjectCache(options?: {
-		namespaces?: string[];
-	}): Promise<{ configured: boolean; active: boolean; purged: string[] }>;
-	getWorkersCacheStatus(): Promise<{ configured: boolean }>;
-	purgeWorkersCache(options?: {
-		pathPrefixes?: string[];
-	}): Promise<{ configured: boolean; purged: boolean; pathPrefixes?: string[] }>;
 	// Logging
 	log(level: "debug" | "info" | "warn" | "error", msg: string, data?: unknown): void;
 }