Skip to content

Commit 64f3042

Browse files
only21milclaude
andauthored
fix(web): closing an invalid When editor no longer leaves Save disabled (#24488)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 4ce54d4 commit 64f3042

2 files changed

Lines changed: 60 additions & 1 deletion

File tree

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
import { RegistryProvider } from "@effect/atom-react";
2+
import { userEvent } from "vite-plus/test/browser";
3+
import { expect, it, vi } from "vite-plus/test";
4+
5+
import { render } from "../../../test/render";
6+
7+
vi.mock(import("./SettingsScopeContext"), async (original) => ({
8+
...(await original()),
9+
useSettingsScope: (() => {
10+
const environment = {
11+
environmentId: "env",
12+
label: "Build workstation",
13+
serverConfig: { keybindings: [], keybindingsConfigPath: null, availableEditors: [] },
14+
};
15+
return {
16+
scope: { kind: "environment" },
17+
environment,
18+
environments: [environment],
19+
connectedEnvironments: [environment],
20+
targets: [],
21+
target: null,
22+
};
23+
}) as never,
24+
}));
25+
vi.mock(import("../../state/session"), async (original) => ({
26+
...(await original()),
27+
useEnvironmentScope: () => true,
28+
useEnvironmentsWithScope: ((environments: ReadonlyArray<{ environmentId: string }>) =>
29+
new Set(environments.map((environment) => environment.environmentId))) as never,
30+
readEnvironmentScope: () => true,
31+
}));
32+
33+
import { KeybindingsSettingsPanel } from "./KeybindingsSettings";
34+
35+
it("re-enables Save when a When editor closes on an expression it could not parse", async () => {
36+
await using screen = await render(
37+
<RegistryProvider>
38+
<KeybindingsSettingsPanel />
39+
</RegistryProvider>,
40+
);
41+
const whenTrigger = screen.getByRole("button", { name: "Edit when clause for Terminal: Toggle" });
42+
const expression = screen.getByRole("textbox", { name: "When expression" });
43+
44+
await whenTrigger.click();
45+
await userEvent.type(expression, "terminalFocus");
46+
await userEvent.type(expression, " &&");
47+
await expect.element(screen.getByRole("button", { name: "Save" })).toBeDisabled();
48+
49+
await userEvent.keyboard("{Escape}");
50+
await whenTrigger.click();
51+
52+
await expect.element(expression).toHaveValue("terminalFocus");
53+
await expect.element(screen.getByRole("button", { name: "Save" })).toBeEnabled();
54+
});

‎apps/web/src/components/settings/KeybindingsSettings.tsx‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,13 @@ function WhenClauseControl({
852852
onChange: (value: KeybindingWhenNode | undefined) => void;
853853
onValidityChange: (valid: boolean) => void;
854854
}) {
855+
// Closing unmounts the builder, which drops an unparsed draft and keeps the last valid value.
856+
const handleOpenChange = (open: boolean) => {
857+
if (!open) onValidityChange(true);
858+
};
859+
855860
return (
856-
<Popover>
861+
<Popover onOpenChange={handleOpenChange}>
857862
<PopoverTrigger
858863
render={
859864
<Button

0 commit comments

Comments
 (0)