diff --git a/canvas/src/components/Canvas.tsx b/canvas/src/components/Canvas.tsx index add2ffa4..714f7e6d 100644 --- a/canvas/src/components/Canvas.tsx +++ b/canvas/src/components/Canvas.tsx @@ -32,7 +32,7 @@ import { Toolbar } from "./Toolbar"; import { ConfirmDialog } from "./ConfirmDialog"; // Phase 20 components import { SettingsPanel, DeleteConfirmDialog } from "./settings"; -// import { ProvisioningTimeout } from "./ProvisioningTimeout"; +import { ProvisioningTimeout } from "./ProvisioningTimeout"; const nodeTypes = { workspaceNode: WorkspaceNode, @@ -334,7 +334,7 @@ function CanvasInner() { - {/* */} + {!selectedNodeId && } {/* Confirmation dialog for structure changes */} diff --git a/canvas/src/components/MemoryInspectorPanel.tsx b/canvas/src/components/MemoryInspectorPanel.tsx index 4f49242b..bb9e7516 100644 --- a/canvas/src/components/MemoryInspectorPanel.tsx +++ b/canvas/src/components/MemoryInspectorPanel.tsx @@ -291,7 +291,11 @@ export function MemoryInspectorPanel({ workspaceId }: Props) { {/* Error banner */} {error && ( -
+
{error}
)} @@ -469,7 +473,9 @@ function MemoryEntryRow({ className="w-full bg-zinc-950 border border-zinc-700 focus:border-blue-500 rounded px-2 py-1.5 text-[11px] font-mono text-zinc-100 focus:outline-none resize-none transition-colors" /> {editError && ( -

{editError}

+

+ {editError} +

)}
diff --git a/canvas/src/components/WorkspaceNode.tsx b/canvas/src/components/WorkspaceNode.tsx index ad469de6..8b1fd5fc 100644 --- a/canvas/src/components/WorkspaceNode.tsx +++ b/canvas/src/components/WorkspaceNode.tsx @@ -344,6 +344,9 @@ function TeamMemberChip({ return (
{ e.stopPropagation(); @@ -354,6 +357,13 @@ function TeamMemberChip({ e.stopPropagation(); useCanvasStore.getState().openContextMenu({ x: e.clientX, y: e.clientY, nodeId: node.id, nodeData: data }); }} + onKeyDown={(e) => { + if (e.key === "Enter" || e.key === " ") { + e.preventDefault(); + e.stopPropagation(); + onSelect(node.id); + } + }} > {/* Status gradient bar */}
@@ -381,7 +391,7 @@ function TeamMemberChip({ e.stopPropagation(); onExtract(node.id); }} - title="Extract from team" + aria-label="Extract from team" className="opacity-0 group-hover/child:opacity-100 text-zinc-500 hover:text-sky-400 transition-all" > diff --git a/canvas/src/components/__tests__/Canvas.a11y.test.tsx b/canvas/src/components/__tests__/Canvas.a11y.test.tsx index a03b5e23..9e50f8fd 100644 --- a/canvas/src/components/__tests__/Canvas.a11y.test.tsx +++ b/canvas/src/components/__tests__/Canvas.a11y.test.tsx @@ -104,6 +104,11 @@ vi.mock("../settings", () => ({ })); vi.mock("../Toaster", () => ({ Toaster: () => null })); vi.mock("../WorkspaceNode", () => ({ WorkspaceNode: () => null })); +vi.mock("../ProvisioningTimeout", () => ({ + ProvisioningTimeout: () => ( +
+ ), +})); // ── Import the component under test AFTER mocks ─────────────────────────────── import { Canvas } from "../Canvas"; @@ -143,3 +148,15 @@ describe("Canvas — accessibility landmarks", () => { expect(position & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy(); }); }); + +// ── Fix #833: ProvisioningTimeout is mounted in the Canvas tree ─────────────── +describe("Canvas — ProvisioningTimeout integration (issue #833)", () => { + it("renders ProvisioningTimeout in the component tree", () => { + render(); + expect( + document.querySelector( + '[data-testid="provisioning-timeout-sentinel"]' + ) + ).toBeTruthy(); + }); +}); diff --git a/canvas/src/components/__tests__/MemoryInspectorPanel.test.tsx b/canvas/src/components/__tests__/MemoryInspectorPanel.test.tsx index 31ef0925..25f308f0 100644 --- a/canvas/src/components/__tests__/MemoryInspectorPanel.test.tsx +++ b/canvas/src/components/__tests__/MemoryInspectorPanel.test.tsx @@ -401,6 +401,45 @@ describe("MemoryInspectorPanel — Refresh button", () => { }); }); +// ── role=alert a11y (issue #830) ───────────────────────────────────────────── + +describe("MemoryInspectorPanel — error elements have role=alert (issue #830)", () => { + it("fetch error banner has role='alert'", async () => { + mockGet.mockRejectedValue(new Error("Network error")); + render(); + await waitFor(() => screen.getByText("Network error")); + const alert = screen.getByRole("alert"); + expect(alert).toBeTruthy(); + expect(alert.textContent).toContain("Network error"); + }); + + it("editError paragraph has role='alert' on invalid JSON submission", async () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + mockGet.mockResolvedValue(TWO_ENTRIES as any); + render(); + await waitFor(() => screen.getByText("task-queue")); + + // Expand and open edit mode + fireEvent.click(screen.getByText("task-queue").closest("button")!); + await waitFor(() => + screen.getByRole("button", { name: "Edit task-queue" }) + ); + fireEvent.click(screen.getByRole("button", { name: "Edit task-queue" })); + + // Submit invalid JSON to trigger editError + fireEvent.change( + screen.getByRole("textbox", { name: "Edit memory value" }), + { target: { value: "{{bad json" } } + ); + fireEvent.click(screen.getByRole("button", { name: /^save$/i })); + + await waitFor(() => screen.getByText(/invalid json/i)); + const alert = screen.getByRole("alert"); + expect(alert).toBeTruthy(); + expect(alert.textContent).toMatch(/invalid json/i); + }); +}); + // ── Semantic search (issue #783) ────────────────────────────────────────────── describe("MemoryInspectorPanel — semantic search", () => { diff --git a/canvas/src/components/__tests__/SidePanel.tabs.test.tsx b/canvas/src/components/__tests__/SidePanel.tabs.test.tsx index 4bd9e75b..ae16e094 100644 --- a/canvas/src/components/__tests__/SidePanel.tabs.test.tsx +++ b/canvas/src/components/__tests__/SidePanel.tabs.test.tsx @@ -217,3 +217,14 @@ describe("SidePanel — localStorage width persistence (issue #425)", () => { expect(parseInt(saved!, 10)).toBeGreaterThanOrEqual(320); }); }); + +// ── Fix #832: close button accessibility ───────────────────────────────────── +describe("SidePanel — close button a11y (issue #832)", () => { + it("close button has aria-label='Close workspace panel'", () => { + render(); + const closeBtn = screen.getByRole("button", { + name: "Close workspace panel", + }); + expect(closeBtn).toBeTruthy(); + }); +}); diff --git a/canvas/src/components/__tests__/WorkspaceNode.a11y.test.tsx b/canvas/src/components/__tests__/WorkspaceNode.a11y.test.tsx new file mode 100644 index 00000000..1a463842 --- /dev/null +++ b/canvas/src/components/__tests__/WorkspaceNode.a11y.test.tsx @@ -0,0 +1,200 @@ +// @vitest-environment jsdom +/** + * WorkspaceNode a11y tests — issue #831 + * + * Covers the TeamMemberChip sub-component (rendered inside a parent workspace + * node when that node has children): + * - role="button" is present + * - aria-label="Select " is present + * - pressing Enter triggers onSelect with the child's id + * - pressing Space triggers onSelect with the child's id + * - the eject button has aria-label="Extract from team" + */ +import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; +import { render, screen, fireEvent, cleanup } from "@testing-library/react"; + +afterEach(() => { + cleanup(); +}); + +// ── Mock @xyflow/react (Handles) ────────────────────────────────────────────── +vi.mock("@xyflow/react", () => ({ + Handle: () => null, + Position: { Top: "top", Bottom: "bottom" }, +})); + +// ── Mock Tooltip (passthrough) ──────────────────────────────────────────────── +vi.mock("@/components/Tooltip", () => ({ + Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}, +})); + +// ── Mock Toaster ────────────────────────────────────────────────────────────── +vi.mock("@/components/Toaster", () => ({ + showToast: vi.fn(), +})); + +// ── Mock design tokens ──────────────────────────────────────────────────────── +vi.mock("@/lib/design-tokens", () => ({ + STATUS_CONFIG: { + online: { + dot: "bg-emerald-400", + glow: "", + bar: "from-emerald-950/30", + label: "Online", + }, + offline: { + dot: "bg-zinc-500", + glow: "", + bar: "from-zinc-900", + label: "Offline", + }, + degraded: { + dot: "bg-amber-400", + glow: "", + bar: "from-amber-950/30", + label: "Degraded", + }, + provisioning: { + dot: "bg-sky-400", + glow: "", + bar: "from-sky-950/30", + label: "Provisioning", + }, + failed: { + dot: "bg-red-400", + glow: "", + bar: "from-red-950/30", + label: "Failed", + }, + }, + TIER_CONFIG: { + 1: { label: "T1", color: "text-zinc-400 bg-zinc-800" }, + 2: { label: "T2", color: "text-zinc-400 bg-zinc-800" }, + 3: { label: "T3", color: "text-zinc-400 bg-zinc-800" }, + }, +})); + +// ── Store state with a parent + one child ──────────────────────────────────── + +const mockSelectNode = vi.fn(); +const mockOpenContextMenu = vi.fn(); +const mockNestNode = vi.fn(); + +const PARENT_ID = "ws-parent"; +const CHILD_ID = "ws-child"; + +const PARENT_DATA = { + name: "Parent Workspace", + status: "online", + tier: 1 as const, + role: "Manager", + parentId: null, + needsRestart: false, + currentTask: null, + activeTasks: 0, + agentCard: null, + runtime: "langgraph", + lastSampleError: null, +}; + +const CHILD_DATA = { + name: "Child Workspace", + status: "online", + tier: 1 as const, + role: "Worker", + parentId: PARENT_ID, + needsRestart: false, + currentTask: null, + activeTasks: 0, + agentCard: null, + runtime: "langgraph", + lastSampleError: null, +}; + +const ALL_NODES = [ + { id: PARENT_ID, position: { x: 0, y: 0 }, data: PARENT_DATA }, + { id: CHILD_ID, position: { x: 0, y: 0 }, data: CHILD_DATA }, +]; + +const mockStoreState = { + nodes: ALL_NODES, + selectedNodeId: null, + dragOverNodeId: null, + selectNode: mockSelectNode, + openContextMenu: mockOpenContextMenu, + nestNode: mockNestNode, + restartWorkspace: vi.fn(() => Promise.resolve()), + setPanelTab: vi.fn(), +}; + +vi.mock("@/store/canvas", () => ({ + useCanvasStore: Object.assign( + vi.fn((selector: (s: typeof mockStoreState) => unknown) => + selector(mockStoreState) + ), + { getState: () => mockStoreState } + ), +})); + +// ── Import component AFTER mocks ────────────────────────────────────────────── +import { WorkspaceNode } from "../WorkspaceNode"; + +// ── Helper ──────────────────────────────────────────────────────────────────── + +function renderParentNode() { + // WorkspaceNode's full NodeProps has many optional fields; we only need id+data + // eslint-disable-next-line @typescript-eslint/no-explicit-any + return render(); +} + +// ── Tests ───────────────────────────────────────────────────────────────────── + +describe("WorkspaceNode — TeamMemberChip a11y (issue #831)", () => { + beforeEach(() => { + vi.clearAllMocks(); + }); + + it("TeamMemberChip renders with role='button'", () => { + renderParentNode(); + // The parent WorkspaceNode div is role=button (aria-label contains the name), + // and the chip is a separate role=button with aria-label starting with "Select" + const chip = screen.getByRole("button", { + name: "Select Child Workspace", + }); + expect(chip).toBeTruthy(); + }); + + it("TeamMemberChip has aria-label='Select '", () => { + renderParentNode(); + const chip = screen.getByRole("button", { + name: "Select Child Workspace", + }); + expect(chip.getAttribute("aria-label")).toBe("Select Child Workspace"); + }); + + it("pressing Enter on TeamMemberChip calls selectNode with the child's id", () => { + renderParentNode(); + const chip = screen.getByRole("button", { + name: "Select Child Workspace", + }); + fireEvent.keyDown(chip, { key: "Enter" }); + expect(mockSelectNode).toHaveBeenCalledWith(CHILD_ID); + }); + + it("pressing Space on TeamMemberChip calls selectNode with the child's id", () => { + renderParentNode(); + const chip = screen.getByRole("button", { + name: "Select Child Workspace", + }); + fireEvent.keyDown(chip, { key: " " }); + expect(mockSelectNode).toHaveBeenCalledWith(CHILD_ID); + }); + + it("eject button has aria-label='Extract from team'", () => { + renderParentNode(); + const ejectBtn = screen.getByRole("button", { + name: "Extract from team", + }); + expect(ejectBtn).toBeTruthy(); + }); +});