Skip to content

Commit 3f2abfd

Browse files
committed
fix(web): catch nested setting keys dropped beside saved ones
1 parent 0d0a149 commit 3f2abfd

2 files changed

Lines changed: 45 additions & 16 deletions

File tree

‎apps/web/src/components/settings/scopedSettings.test.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,29 @@ describe("scoped settings writes", () => {
280280
await outcome(
281281
planScopedSettingsPatch(project, environments, { defaultAutoPull: true }),
282282
upgradedLaptop({
283-
projectSettingsOverrides: { [projectId]: { defaultAutoPull: true } },
283+
projectSettingsOverrides: { [laptopProjectId]: { defaultAutoPull: true } },
284284
}),
285285
),
286286
).toEqual({ saved: [laptop.label], failed: unsupported });
287287
});
288288

289+
it("reports a nested key dropped beside one that saved", async () => {
290+
const patch = { defaultAutoPull: true, enableAgentBrowserAccess: false };
291+
const persistServer = vi.fn(async ({ environmentId }: { environmentId: EnvironmentId }) => ({
292+
_tag: "Success" as const,
293+
value: {
294+
...DEFAULT_SERVER_SETTINGS,
295+
projectSettingsOverrides:
296+
environmentId === laptop.environmentId
297+
? { [laptopProjectId]: patch }
298+
: { [projectId]: { defaultAutoPull: true } },
299+
},
300+
}));
301+
expect(
302+
await outcome(planScopedSettingsPatch(project, environments, patch), persistServer),
303+
).toEqual({ saved: [laptop.label], failed: unsupported });
304+
});
305+
289306
it("accepts a write that matches what the environment already had", async () => {
290307
expect(
291308
await outcome(

‎apps/web/src/components/settings/scopedSettings.ts‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -402,31 +402,43 @@ export function planProjectOverridesClear(
402402
};
403403
}
404404

405-
/** Whether writing `value` leaves `current` as it is. Partial objects compare only the fields they set. */
406-
function patchLeavesUnchanged(value: unknown, current: unknown): boolean {
407-
if (typeof value === "string" && typeof current === "string") return value.trim() === current;
408-
if (isPlainObject(value) && isPlainObject(current)) {
409-
return Object.entries(value).every(([field, next]) =>
410-
next === null ? current[field] == null : patchLeavesUnchanged(next, current[field]),
405+
/**
406+
* Whether a server kept `before` where `value` asked for a change. Objects are
407+
* compared field by field, so a nested key an older server dropped is caught
408+
* even when a sibling field saved. A null clears the field; strings may come
409+
* back trimmed.
410+
*/
411+
function writeWasDropped(value: unknown, before: unknown, saved: unknown): boolean {
412+
if (value === null) return before != null && Equal.equals(saved, before);
413+
if (isPlainObject(value) && !Array.isArray(before) && !Array.isArray(saved)) {
414+
const field = (source: unknown, key: string) =>
415+
isPlainObject(source) ? source[key] : undefined;
416+
return Object.entries(value).some(([key, next]) =>
417+
writeWasDropped(next, field(before, key), field(saved, key)),
411418
);
412419
}
413-
return Equal.equals(value, current);
420+
const unchanged =
421+
typeof value === "string" && typeof before === "string"
422+
? value.trim() === before
423+
: Equal.equals(value, before);
424+
return !unchanged && Equal.equals(saved, before);
414425
}
415426

416427
/**
417428
* An older server drops keys it does not know, top-level or nested, and still
418-
* succeeds. A key that should have changed but reads back as it was before
419-
* the write was dropped; left unreported, the row stays mixed forever.
429+
* succeeds. Left unreported, the row stays mixed forever.
420430
*/
421431
function droppedSettingKeys(write: ScopedServerWrite, saved: ServerSettings | undefined) {
422432
if (saved === undefined) return [];
423-
return Object.entries(write.patch).flatMap(([key, value]) => {
424-
const before = write.previous[key as keyof ServerSettings];
425-
return Equal.equals(saved[key as keyof ServerSettings], before) &&
426-
!patchLeavesUnchanged(value, before)
433+
return Object.entries(write.patch).flatMap(([key, value]) =>
434+
writeWasDropped(
435+
value,
436+
write.previous[key as keyof ServerSettings],
437+
saved[key as keyof ServerSettings],
438+
)
427439
? [key]
428-
: [];
429-
});
440+
: [],
441+
);
430442
}
431443

432444
/** Wait for every target so a failed environment does not hide successful or later writes. */

0 commit comments

Comments
 (0)