Skip to content

Commit e9b370e

Browse files
committed
fix(gui): keep unsaved settings draft across an account-mode refresh
The form-reset effect used to depend on item.codexAccountMode, so the config refresh that follows a successful mode PATCH wiped any in-progress draft (e.g. an edited note). Account mode now syncs in its own effect, and modeSavedRef is removed because the reset effect no longer runs on mode changes.
1 parent f26edc8 commit e9b370e

2 files changed

Lines changed: 49 additions & 19 deletions

File tree

‎gui/src/components/provider-workspace/ProviderSettings.tsx‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ export default function ProviderSettings({
5050
const [accountMode, setAccountMode] = useState<"pool" | "direct">(item.codexAccountMode ?? "pool");
5151
const [modeSaving, setModeSaving] = useState(false);
5252
const [modeMsg, setModeMsg] = useState<{ ok: boolean; text: string } | null>(null);
53-
/** Set while the reset effect must keep the just-applied account-mode message. */
54-
const modeSavedRef = useRef(false);
5553
const [baseUrlChoices, setBaseUrlChoices] = useState<CatalogPreset["baseUrlChoices"]>();
5654
const [choicesStatus, setChoicesStatus] = useState<ChoicesStatus>(apiBase ? "loading" : "idle");
5755
const [endpointChoice, setEndpointChoice] = useState(() => "custom");
@@ -66,12 +64,18 @@ export default function ProviderSettings({
6664
setNote(item.note ?? "");
6765
setAllowPrivateNetwork(item.allowPrivateNetwork ?? false);
6866
setLiveModels(item.liveModels !== false);
69-
setAccountMode(item.codexAccountMode ?? "pool");
7067
setMsg(null);
71-
if (!modeSavedRef.current) setModeMsg(null);
72-
modeSavedRef.current = false;
68+
setModeMsg(null);
7369
queueMicrotask(() => setEndpointChoice(matchChoiceId(baseUrlChoices, item.baseUrl)));
74-
}, [item.adapter, item.baseUrl, item.defaultModel, item.authMode, item.apiKeyTransport, item.keyOptional, item.note, item.allowPrivateNetwork, item.liveModels, item.codexAccountMode, baseUrlChoices]);
70+
}, [item.adapter, item.baseUrl, item.defaultModel, item.authMode, item.apiKeyTransport, item.keyOptional, item.note, item.allowPrivateNetwork, item.liveModels, baseUrlChoices]);
71+
/* eslint-enable react-hooks/set-state-in-effect */
72+
73+
// Account mode syncs on its own: a mode PATCH refresh must not reset an in-progress
74+
// draft, so it is deliberately kept out of the form-reset effect above.
75+
/* eslint-disable react-hooks/set-state-in-effect -- intentional split from the form reset */
76+
useEffect(() => {
77+
setAccountMode(item.codexAccountMode ?? "pool");
78+
}, [item.codexAccountMode]);
7579
/* eslint-enable react-hooks/set-state-in-effect */
7680

7781
useEffect(() => {
@@ -179,7 +183,6 @@ export default function ProviderSettings({
179183
try {
180184
const res = await onUpdateProvider("openai", { codexAccountMode: next });
181185
if (res.ok) {
182-
modeSavedRef.current = true;
183186
setAccountMode(next);
184187
setModeMsg({ ok: true, text: t("pws.accountModeSaved") });
185188
} else {

‎gui/tests/provider-settings-account-mode.test.tsx‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,27 +53,34 @@ async function mountSettings(
5353
root: Root;
5454
container: HTMLElement;
5555
patches: ProviderUpdatePatch[];
56+
rerender: (item: WorkspaceItem) => Promise<void>;
5657
}> {
5758
const patches: ProviderUpdatePatch[] = [];
5859
const container = document.createElement("div");
5960
document.body.append(container);
6061
const { createRoot } = await import("react-dom/client");
6162
let root!: Root;
63+
const renderItem = (it: WorkspaceItem) => (
64+
<LanguageProvider>
65+
<ProviderSettings
66+
item={it}
67+
onUpdateProvider={async (name, patch) => {
68+
patches.push(patch);
69+
return onUpdateProvider ? onUpdateProvider(name, patch) : { ok: true };
70+
}}
71+
/>
72+
</LanguageProvider>
73+
);
6274
await act(async () => {
6375
root = createRoot(container);
64-
root.render(
65-
<LanguageProvider>
66-
<ProviderSettings
67-
item={item}
68-
onUpdateProvider={async (name, patch) => {
69-
patches.push(patch);
70-
return onUpdateProvider ? onUpdateProvider(name, patch) : { ok: true };
71-
}}
72-
/>
73-
</LanguageProvider>,
74-
);
76+
root.render(renderItem(item));
7577
});
76-
return { root, container, patches };
78+
return {
79+
root,
80+
container,
81+
patches,
82+
rerender: (it: WorkspaceItem) => act(async () => { root.render(renderItem(it)); }),
83+
};
7784
}
7885

7986
function modeSelect(container: HTMLElement): HTMLSelectElement {
@@ -174,3 +181,23 @@ test("the mode select is disabled while an ordinary settings save is in flight",
174181
expect(modeSelect(container).disabled).toBe(false);
175182
await act(async () => { root.unmount(); });
176183
});
184+
185+
test("a mode-change config refresh does not wipe an unsaved draft", async () => {
186+
const { root, container, rerender } = await mountSettings(openAiItem("pool"));
187+
const note = container.querySelector<HTMLTextAreaElement>(".pwi-settings-textarea")!;
188+
189+
await act(async () => {
190+
Object.getOwnPropertyDescriptor(testWindow.HTMLTextAreaElement.prototype, "value")!
191+
.set!.call(note, "draft");
192+
note.dispatchEvent(new testWindow.Event("input", { bubbles: true }));
193+
});
194+
expect(container.querySelector(".pwi-settings-sticky-bar")).toBeTruthy();
195+
196+
// Simulate the config refresh that follows a successful mode PATCH.
197+
await rerender(openAiItem("direct"));
198+
199+
expect(container.querySelector<HTMLTextAreaElement>(".pwi-settings-textarea")!.value).toBe("draft");
200+
expect(container.querySelector(".pwi-settings-sticky-bar")).toBeTruthy();
201+
expect(modeSelect(container).value).toBe("direct");
202+
await act(async () => { root.unmount(); });
203+
});

0 commit comments

Comments
 (0)