Skip to content

Commit 08c0051

Browse files
committed
fix(web): keep retention changes limited to layout
1 parent 27b85d2 commit 08c0051

4 files changed

Lines changed: 23 additions & 242 deletions

File tree

‎apps/web/src/components/settings/SourceControlWritingSettings.browser.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import type { ScopedSettingsPatch } from "./scopedSettings";
1010
type WritingStyle = typeof DEFAULT_UNIFIED_SETTINGS.sourceControlWritingStyle;
1111
const state = vi.hoisted(() => ({
1212
styles: [] as WritingStyle[],
13-
updateSettings: vi.fn<(patch: ScopedSettingsPatch) => Promise<void>>(),
13+
updateSettings: vi.fn<(patch: ScopedSettingsPatch) => void>(),
1414
}));
1515

1616
vi.mock(import("@tanstack/react-router"), async (original) => ({
@@ -84,7 +84,7 @@ async function setup() {
8484
},
8585
];
8686
const screen = await render(content());
87-
state.updateSettings.mockReset().mockImplementation(async (patch) => {
87+
state.updateSettings.mockReset().mockImplementation((patch) => {
8888
state.styles = state.styles.map((style) => ({ ...style, ...patch.sourceControlWritingStyle }));
8989
void screen.rerender(content());
9090
});

‎apps/web/src/components/settings/StorageSettings.browser.test.tsx‎

Lines changed: 12 additions & 184 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ import { expect, it, vi } from "vite-plus/test";
66

77
const state = vi.hoisted(() => ({
88
settings: {} as typeof DEFAULT_SERVER_SETTINGS,
9-
targets: [] as {
10-
environmentId: string;
11-
settings: typeof DEFAULT_SERVER_SETTINGS;
12-
}[],
139
run: vi.fn(),
14-
update: vi.fn(),
1510
report: null as StorageCleanupReport | null,
1611
}));
1712

@@ -39,11 +34,11 @@ vi.mock(import("../../state/use-atom-command"), async (original) => ({
3934
vi.mock(import("./SettingsScopeContext"), async (original) => ({
4035
...(await original()),
4136
useSettingsScope: (() => {
42-
const environments = state.targets.map(({ environmentId, settings }) => ({
43-
environmentId,
44-
label: environmentId,
37+
const environment = {
38+
environmentId: "env",
39+
label: "Build workstation",
4540
serverConfig: {
46-
settings,
41+
settings: state.settings,
4742
environment: {
4843
capabilities: {
4944
storageCleanup: true,
@@ -52,34 +47,30 @@ vi.mock(import("./SettingsScopeContext"), async (original) => ({
5247
},
5348
},
5449
},
55-
}));
50+
};
5651
return {
57-
scope: { kind: "all" },
58-
environments,
59-
connectedEnvironments: environments,
60-
targets: state.targets.map(({ environmentId, settings }) => ({
61-
environmentId,
62-
settings,
63-
})),
64-
target: state.targets[0] ? { settings: state.targets[0].settings } : null,
52+
scope: { kind: "environment" },
53+
environments: [environment],
54+
connectedEnvironments: [environment],
55+
targets: [],
56+
target: null,
6557
};
6658
}) as never,
6759
}));
6860
vi.mock(import("./useScopedSettings"), async (original) => ({
6961
...(await original()),
7062
useScopedSettings: (() => state.settings) as never,
7163
useScopedSettingsMixed: () => false,
72-
useUpdateScopedSettings: () => state.update,
64+
useUpdateScopedSettings: () => vi.fn(),
7365
useClearScopedSettings: () => vi.fn(),
7466
}));
7567
vi.mock(import("./settingsLayout"), async (original) => ({
7668
...(await original()),
7769
SettingsPageContainer: (({ children }: { children: ReactNode }) => children) as never,
78-
SettingsRow: ({ title, description, status, control, children }) => (
70+
SettingsRow: ({ title, description, control, children }) => (
7971
<div>
8072
<h3>{title}</h3>
8173
{description}
82-
{status}
8374
{control}
8475
{children}
8576
</div>
@@ -110,17 +101,6 @@ function setup() {
110101
};
111102
state.report = null;
112103
state.run.mockReset();
113-
state.targets = [
114-
{ environmentId: "machine-a", settings: state.settings },
115-
{
116-
environmentId: "machine-b",
117-
settings: {
118-
...state.settings,
119-
storageCleanup: { ...state.settings.storageCleanup },
120-
},
121-
},
122-
];
123-
state.update.mockReset().mockResolvedValue(undefined);
124104
}
125105

126106
const panel = () => (
@@ -142,155 +122,3 @@ it("keeps cleanup disabled when settled retention and all other rules are off",
142122
await act(async () => button.click());
143123
expect(state.run).not.toHaveBeenCalled();
144124
});
145-
146-
function setArtifactRetention(machineIndex: number, value: number | null) {
147-
const target = state.targets[machineIndex]!;
148-
target.settings = {
149-
...target.settings,
150-
storageCleanup: { ...target.settings.storageCleanup, browserArtifactsAfterDays: value },
151-
};
152-
if (machineIndex === 0) state.settings = target.settings;
153-
}
154-
155-
function retentionSwitch(container: HTMLElement) {
156-
return Array.from(container.querySelectorAll<HTMLButtonElement>('[role="switch"]')).find(
157-
(control) => control.getAttribute("aria-label") === "Delete old browser artifacts",
158-
)!;
159-
}
160-
161-
function ruleIsMixed(container: HTMLElement, title: string) {
162-
return Array.from(container.querySelectorAll("h3"))
163-
.find((heading) => heading.textContent === title)
164-
?.parentElement?.textContent?.includes("Mixed across selected machines");
165-
}
166-
167-
const artifactIsMixed = (container: HTMLElement) =>
168-
ruleIsMixed(container, "Delete old browser artifacts");
169-
const logsAreMixed = (container: HTMLElement) => ruleIsMixed(container, "Delete old rotated logs");
170-
171-
function deferredSave() {
172-
let resolve!: () => void;
173-
const promise = new Promise<void>((done) => {
174-
resolve = done;
175-
});
176-
return { promise, resolve };
177-
}
178-
179-
function stepArtifacts(container: HTMLElement, direction: "Increase" | "Decrease") {
180-
container
181-
.querySelector<HTMLButtonElement>(`[aria-label="${direction} Delete old browser artifacts"]`)!
182-
.click();
183-
}
184-
185-
it("does not add a mixed warning before every machine projects a completed save", async () => {
186-
setup();
187-
setArtifactRetention(0, 9);
188-
setArtifactRetention(1, 9);
189-
const save = deferredSave();
190-
state.update.mockReturnValue(save.promise);
191-
await using screen = await render(panel());
192-
expect(artifactIsMixed(screen.container)).toBe(false);
193-
194-
await act(async () => stepArtifacts(screen.container, "Increase"));
195-
setArtifactRetention(0, 10);
196-
const machineB = state.targets[1]!;
197-
machineB.settings = {
198-
...machineB.settings,
199-
storageCleanup: { ...machineB.settings.storageCleanup, logsAfterDays: 30 },
200-
};
201-
await act(async () => save.resolve());
202-
await screen.rerender(panel());
203-
expect(artifactIsMixed(screen.container)).toBe(false);
204-
expect(logsAreMixed(screen.container)).toBe(true);
205-
206-
setArtifactRetention(1, 10);
207-
await screen.rerender(panel());
208-
expect(artifactIsMixed(screen.container)).toBe(false);
209-
210-
setArtifactRetention(1, 11);
211-
await screen.rerender(panel());
212-
expect(artifactIsMixed(screen.container)).toBe(true);
213-
});
214-
215-
it.each([14, 30])(
216-
"shows genuine differences after a partial save fails with a second value of %i",
217-
async (secondValue) => {
218-
setup();
219-
setArtifactRetention(0, 14);
220-
setArtifactRetention(1, secondValue);
221-
const save = deferredSave();
222-
let onFailed!: () => void;
223-
state.update.mockImplementation((_patch, options) => {
224-
onFailed = options.onFailed;
225-
return save.promise;
226-
});
227-
await using screen = await render(panel());
228-
expect(artifactIsMixed(screen.container)).toBe(secondValue !== 14);
229-
230-
await act(async () => retentionSwitch(screen.container).click());
231-
setArtifactRetention(0, null);
232-
await screen.rerender(panel());
233-
expect(artifactIsMixed(screen.container)).toBe(secondValue !== 14);
234-
235-
await act(async () => {
236-
onFailed();
237-
save.resolve();
238-
});
239-
expect(artifactIsMixed(screen.container)).toBe(true);
240-
},
241-
);
242-
243-
it("keeps a reversed edit pending and ignores a superseded save failure", async () => {
244-
setup();
245-
setArtifactRetention(0, 9);
246-
setArtifactRetention(1, 9);
247-
const first = deferredSave();
248-
const second = deferredSave();
249-
let failFirst!: () => void;
250-
state.update
251-
.mockImplementationOnce((_patch, options) => {
252-
failFirst = options.onFailed;
253-
return first.promise;
254-
})
255-
.mockReturnValueOnce(second.promise);
256-
await using screen = await render(panel());
257-
await act(async () => stepArtifacts(screen.container, "Increase"));
258-
await act(async () => stepArtifacts(screen.container, "Decrease"));
259-
260-
setArtifactRetention(0, 10);
261-
await screen.rerender(panel());
262-
expect(artifactIsMixed(screen.container)).toBe(false);
263-
await act(async () => {
264-
failFirst();
265-
first.resolve();
266-
});
267-
expect(artifactIsMixed(screen.container)).toBe(false);
268-
269-
setArtifactRetention(0, 9);
270-
setArtifactRetention(1, 10);
271-
await act(async () => second.resolve());
272-
await screen.rerender(panel());
273-
expect(artifactIsMixed(screen.container)).toBe(false);
274-
setArtifactRetention(1, 9);
275-
await screen.rerender(panel());
276-
expect(artifactIsMixed(screen.container)).toBe(false);
277-
278-
setArtifactRetention(1, 12);
279-
await screen.rerender(panel());
280-
expect(artifactIsMixed(screen.container)).toBe(true);
281-
});
282-
283-
it("uses the newly selected machines rather than an older pending edit", async () => {
284-
setup();
285-
const save = deferredSave();
286-
state.update.mockReturnValue(save.promise);
287-
await using screen = await render(panel());
288-
await act(async () => retentionSwitch(screen.container).click());
289-
setArtifactRetention(0, 8);
290-
state.targets[1] = { ...state.targets[1]!, environmentId: "machine-c" };
291-
setArtifactRetention(1, 30);
292-
await screen.rerender(panel());
293-
expect(artifactIsMixed(screen.container)).toBe(true);
294-
await act(async () => save.resolve());
295-
expect(artifactIsMixed(screen.container)).toBe(true);
296-
});

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

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -695,61 +695,14 @@ export function StorageCleanupSections() {
695695
const { scope, connectedEnvironments, targets } = useSettingsScope();
696696
const scopedSettings = useScopedSettings();
697697
const updateSettings = useUpdateScopedSettings();
698-
type RetentionRule = "browserArtifactsAfterDays" | "logsAfterDays";
699-
const [pendingRules, setPendingRules] = useState(
700-
() =>
701-
new Map<
702-
RetentionRule,
703-
{
704-
targetSetKey: string;
705-
value: number | null;
706-
mixed: boolean;
707-
saving: boolean;
708-
}
709-
>(),
710-
);
711-
const settings = scopedSettings.storageCleanup;
712-
const targetSetKey = `${scope.kind}:${environmentIdsKey(targets.map((target) => target.environmentId).sort())}`;
713-
const currentRuleMixed = (key: RetentionRule) =>
714-
targets.some((target) => target.settings.storageCleanup[key] !== settings[key]);
715-
for (const [key, pending] of pendingRules) {
716-
if (
717-
pending.targetSetKey !== targetSetKey ||
718-
(!pending.saving &&
719-
targets.every((target) => target.settings.storageCleanup[key] === pending.value))
720-
) {
721-
const next = new Map(pendingRules);
722-
next.delete(key);
723-
setPendingRules(next);
724-
break;
725-
}
726-
}
727698
if (scope.kind === "project" || scope.kind === "checkout") return null;
728-
const saveRule = (key: RetentionRule, value: number | null) => {
729-
const pending = {
730-
targetSetKey,
731-
value,
732-
mixed: pendingRules.get(key)?.mixed ?? currentRuleMixed(key),
733-
saving: true,
734-
};
735-
const updatePending = (saved: boolean) =>
736-
setPendingRules((current) => {
737-
if (current.get(key) !== pending) return current;
738-
const next = new Map(current);
739-
if (saved) next.set(key, { ...pending, saving: false });
740-
else next.delete(key);
741-
return next;
742-
});
743-
setPendingRules((current) => new Map(current).set(key, pending));
744-
void updateSettings(
745-
{ storageCleanup: { [key]: value } },
746-
{ onFailed: () => updatePending(false) },
747-
).then(() => updatePending(true));
748-
};
749-
const ruleStatus = (key: RetentionRule) =>
750-
(pendingRules.get(key)?.mixed ?? currentRuleMixed(key))
699+
const settings = scopedSettings.storageCleanup;
700+
const ruleStatus = (key: "browserArtifactsAfterDays" | "logsAfterDays") =>
701+
targets.some((target) => target.settings.storageCleanup[key] !== settings[key])
751702
? "Mixed across selected machines"
752703
: undefined;
704+
const update = (patch: Partial<StorageCleanupSettings>) =>
705+
updateSettings({ storageCleanup: patch });
753706
const databaseStorageNotice = (
754707
<DatabaseStorageNotice
755708
environments={connectedEnvironments.filter(
@@ -783,7 +736,7 @@ export function StorageCleanupSections() {
783736
<RetentionControl
784737
label="Delete old browser artifacts"
785738
value={settings.browserArtifactsAfterDays}
786-
onChange={(value) => saveRule("browserArtifactsAfterDays", value)}
739+
onChange={(browserArtifactsAfterDays) => update({ browserArtifactsAfterDays })}
787740
/>
788741
}
789742
/>
@@ -798,7 +751,7 @@ export function StorageCleanupSections() {
798751
<RetentionControl
799752
label="Delete old rotated logs"
800753
value={settings.logsAfterDays}
801-
onChange={(value) => saveRule("logsAfterDays", value)}
754+
onChange={(logsAfterDays) => update({ logsAfterDays })}
802755
/>
803756
}
804757
/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ function useRunScopedPlan() {
5757
description: plan.unavailableReason,
5858
});
5959
onFailed?.();
60-
return Promise.resolve();
60+
return;
6161
}
62-
return persistScopedSettingsPatch(
62+
void persistScopedSettingsPatch(
6363
plan,
6464
async (request) => {
6565
const missing = requiredScopesForServerSettingsPatch(request.input.patch).find(

0 commit comments

Comments
 (0)