Skip to content

Commit de6d4bf

Browse files
0bkevinmaria-rcks
andauthored
fix(web): keep retention controls stable while editing days (#26335)
Co-authored-by: maria-rcks <[email protected]>
1 parent a05e8fd commit de6d4bf

2 files changed

Lines changed: 180 additions & 42 deletions

File tree

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

Lines changed: 124 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { act, render } from "../../../test/render";
1+
import { act, fakeTimers, render } from "../../../test/render";
22
import { RegistryProvider } from "@effect/atom-react";
33
import { DEFAULT_SERVER_SETTINGS, type StorageCleanupReport } from "@t3tools/contracts";
44
import { type ReactNode } from "react";
55
import { expect, it, vi } from "vite-plus/test";
66

77
const state = vi.hoisted(() => ({
88
settings: {} as typeof DEFAULT_SERVER_SETTINGS,
9+
targets: [] as Array<{ environmentId: string; settings: typeof DEFAULT_SERVER_SETTINGS }>,
910
run: vi.fn(),
1011
report: null as StorageCleanupReport | null,
1112
}));
@@ -34,11 +35,11 @@ vi.mock(import("../../state/use-atom-command"), async (original) => ({
3435
vi.mock(import("./SettingsScopeContext"), async (original) => ({
3536
...(await original()),
3637
useSettingsScope: (() => {
37-
const environment = {
38-
environmentId: "env",
39-
label: "Build workstation",
38+
const environments = state.targets.map(({ environmentId, settings }) => ({
39+
environmentId,
40+
label: environmentId,
4041
serverConfig: {
41-
settings: state.settings,
42+
settings,
4243
environment: {
4344
capabilities: {
4445
storageCleanup: true,
@@ -47,12 +48,12 @@ vi.mock(import("./SettingsScopeContext"), async (original) => ({
4748
},
4849
},
4950
},
50-
};
51+
}));
5152
return {
52-
scope: { kind: "environment" },
53-
environments: [environment],
54-
connectedEnvironments: [environment],
55-
targets: [],
53+
scope: { kind: "all" },
54+
environments,
55+
connectedEnvironments: environments,
56+
targets: state.targets,
5657
target: null,
5758
};
5859
}) as never,
@@ -67,10 +68,17 @@ vi.mock(import("./useScopedSettings"), async (original) => ({
6768
vi.mock(import("./settingsLayout"), async (original) => ({
6869
...(await original()),
6970
SettingsPageContainer: (({ children }: { children: ReactNode }) => children) as never,
70-
SettingsRow: ({ title, description, control, children }) => (
71+
SettingsRow: ({ title, description, status, control, children }) => (
7172
<div>
7273
<h3>{title}</h3>
7374
{description}
75+
{status && (
76+
<div
77+
data-testid={`${title === "Delete old browser artifacts" ? "artifact" : "logs"}-retention-status`}
78+
>
79+
{status}
80+
</div>
81+
)}
7482
{control}
7583
{children}
7684
</div>
@@ -99,10 +107,33 @@ function setup() {
99107
},
100108
projectSettingsOverrides: {},
101109
};
110+
state.targets = ["env-a", "env-b"].map((environmentId) => ({
111+
environmentId,
112+
settings: state.settings,
113+
}));
102114
state.report = null;
103115
state.run.mockReset();
104116
}
105117

118+
function setRetentionValues(
119+
artifactDays: ReadonlyArray<number | null>,
120+
logDays: ReadonlyArray<number | null> = artifactDays.map(() => null),
121+
environmentIds: readonly string[] = ["env-a", "env-b"],
122+
) {
123+
state.targets = artifactDays.map((browserArtifactsAfterDays, index) => ({
124+
environmentId: environmentIds[index]!,
125+
settings: {
126+
...state.settings,
127+
storageCleanup: {
128+
...state.settings.storageCleanup,
129+
browserArtifactsAfterDays,
130+
logsAfterDays: logDays[index]!,
131+
},
132+
},
133+
}));
134+
state.settings = state.targets[0]?.settings ?? state.settings;
135+
}
136+
106137
const panel = () => (
107138
<RegistryProvider>
108139
<StorageCleanupSections />
@@ -122,3 +153,85 @@ it("keeps cleanup disabled when settled retention and all other rules are off",
122153
await act(async () => button.click());
123154
expect(state.run).not.toHaveBeenCalled();
124155
});
156+
157+
it("settles mixed retention statuses independently across selected machines", async () => {
158+
setup();
159+
using _timers = fakeTimers();
160+
await using screen = await render(panel());
161+
const advance = (ms: number) => act(() => vi.advanceTimersByTime(ms));
162+
163+
await advance(300);
164+
setRetentionValues([8, null], [8, null]);
165+
await screen.rerender(panel());
166+
await advance(125);
167+
await expect.element(screen.getByTestId("artifact-retention-status")).not.toBeInTheDocument();
168+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
169+
setRetentionValues([null, null], [8, null]);
170+
await screen.rerender(panel());
171+
await advance(8);
172+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
173+
await advance(117);
174+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
175+
setRetentionValues([null, null]);
176+
await screen.rerender(panel());
177+
await advance(300);
178+
await expect.element(screen.getByTestId("artifact-retention-status")).not.toBeInTheDocument();
179+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
180+
181+
setRetentionValues([8, null]);
182+
await screen.rerender(panel());
183+
await advance(300);
184+
await expect
185+
.element(screen.getByTestId("artifact-retention-status"))
186+
.toHaveTextContent("Mixed across selected machines");
187+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
188+
189+
setRetentionValues([null, null]);
190+
await screen.rerender(panel());
191+
await advance(75);
192+
await expect
193+
.element(screen.getByTestId("artifact-retention-status"))
194+
.toHaveTextContent("Mixed across selected machines");
195+
setRetentionValues([8, null]);
196+
await screen.rerender(panel());
197+
await advance(133);
198+
await expect
199+
.element(screen.getByTestId("artifact-retention-status"))
200+
.toHaveTextContent("Mixed across selected machines");
201+
setRetentionValues([null, null]);
202+
await screen.rerender(panel());
203+
await advance(133);
204+
await expect
205+
.element(screen.getByTestId("artifact-retention-status"))
206+
.toHaveTextContent("Mixed across selected machines");
207+
await advance(117);
208+
await expect
209+
.element(screen.getByTestId("artifact-retention-status"))
210+
.toHaveTextContent("Mixed across selected machines");
211+
setRetentionValues([8, null]);
212+
await screen.rerender(panel());
213+
await advance(300);
214+
await expect
215+
.element(screen.getByTestId("artifact-retention-status"))
216+
.toHaveTextContent("Mixed across selected machines");
217+
218+
setRetentionValues([8], [null], ["env-c"]);
219+
await screen.rerender(panel());
220+
await expect.element(screen.getByTestId("artifact-retention-status")).not.toBeInTheDocument();
221+
222+
setRetentionValues([null, null], [null, null], ["env-c", "env-d"]);
223+
await screen.rerender(panel());
224+
await expect.element(screen.getByTestId("artifact-retention-status")).not.toBeInTheDocument();
225+
226+
setRetentionValues([null, null], [8, null]);
227+
await screen.rerender(panel());
228+
await advance(300);
229+
await expect.element(screen.getByTestId("artifact-retention-status")).not.toBeInTheDocument();
230+
await expect
231+
.element(screen.getByTestId("logs-retention-status"))
232+
.toHaveTextContent("Mixed across selected machines");
233+
setRetentionValues([null, null]);
234+
await screen.rerender(panel());
235+
await advance(300);
236+
await expect.element(screen.getByTestId("logs-retention-status")).not.toBeInTheDocument();
237+
});

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

Lines changed: 56 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import { serverEnvironment } from "../../state/server";
1616
import { useAtomCommand } from "../../state/use-atom-command";
1717
import { formatRelativeTimeLabel } from "../../timestampFormat";
1818
import { useNowMinute } from "../../hooks/useNowMinute";
19+
import { useDebouncedValue } from "../../state/queries";
20+
import { AnimatedHeight } from "../AnimatedHeight";
1921
import { Button } from "../ui/button";
2022
import { toastManager } from "../ui/toast";
2123

@@ -142,8 +144,8 @@ function RetentionControl({
142144
<NumberFieldDecrement aria-label={`Decrease ${label}`} />
143145
<NumberFieldInput
144146
aria-label={`${label} in days`}
145-
size={new Intl.NumberFormat().format(draft ?? value).length}
146-
className="field-sizing-content w-auto min-w-[1ch] grow-0 text-right"
147+
size={5}
148+
className="w-auto grow-0 text-right"
147149
/>
148150
<span aria-hidden="true" className="self-center pr-2 text-xs">
149151
days
@@ -694,12 +696,31 @@ export function StorageCleanupSections() {
694696
const { scope, connectedEnvironments, targets } = useSettingsScope();
695697
const scopedSettings = useScopedSettings();
696698
const updateSettings = useUpdateScopedSettings();
697-
if (scope.kind === "project" || scope.kind === "checkout") return null;
698699
const settings = scopedSettings.storageCleanup;
699-
const ruleStatus = (key: "browserArtifactsAfterDays" | "logsAfterDays") =>
700-
targets.some((target) => target.settings.storageCleanup[key] !== settings[key])
700+
const targetIdsKey = environmentIdsKey(targets.map((target) => target.environmentId).sort());
701+
const artifactsMixed =
702+
targets.length > 1 &&
703+
targets.some(
704+
(target) =>
705+
target.settings.storageCleanup.browserArtifactsAfterDays !==
706+
settings.browserArtifactsAfterDays,
707+
);
708+
const logsMixed =
709+
targets.length > 1 &&
710+
targets.some(
711+
(target) => target.settings.storageCleanup.logsAfterDays !== settings.logsAfterDays,
712+
);
713+
const settledArtifactsStatus = useDebouncedValue(`${targetIdsKey}:${artifactsMixed}`, 300);
714+
const settledLogsStatus = useDebouncedValue(`${targetIdsKey}:${logsMixed}`, 300);
715+
const artifactsStatus =
716+
targets.length > 1 && settledArtifactsStatus === `${targetIdsKey}:true`
717+
? "Mixed across selected machines"
718+
: undefined;
719+
const logsStatus =
720+
targets.length > 1 && settledLogsStatus === `${targetIdsKey}:true`
701721
? "Mixed across selected machines"
702722
: undefined;
723+
if (scope.kind === "project" || scope.kind === "checkout") return null;
703724
const update = (patch: Partial<StorageCleanupSettings>) =>
704725
updateSettings({ storageCleanup: patch });
705726
const databaseStorageNotice = (
@@ -725,32 +746,36 @@ export function StorageCleanupSections() {
725746
<>
726747
{databaseStorageNotice}
727748
<SettingsSection id="storage-artifacts" title="Artifacts and logs">
728-
<SettingsRow
729-
title="Delete old browser artifacts"
730-
status={ruleStatus("browserArtifactsAfterDays")}
731-
description="Delete saved browser captures after this many days. Older capture links will no longer open."
732-
serverScoped
733-
control={
734-
<RetentionControl
735-
label="Delete old browser artifacts"
736-
value={settings.browserArtifactsAfterDays}
737-
onChange={(browserArtifactsAfterDays) => update({ browserArtifactsAfterDays })}
738-
/>
739-
}
740-
/>
741-
<SettingsRow
742-
title="Delete old rotated logs"
743-
status={ruleStatus("logsAfterDays")}
744-
description="Delete inactive rotated log files after this many days. Current logs are kept."
745-
serverScoped
746-
control={
747-
<RetentionControl
748-
label="Delete old rotated logs"
749-
value={settings.logsAfterDays}
750-
onChange={(logsAfterDays) => update({ logsAfterDays })}
751-
/>
752-
}
753-
/>
749+
<AnimatedHeight>
750+
<SettingsRow
751+
title="Delete old browser artifacts"
752+
status={artifactsStatus}
753+
description="Delete saved browser captures after this many days. Older capture links will no longer open."
754+
serverScoped
755+
control={
756+
<RetentionControl
757+
label="Delete old browser artifacts"
758+
value={settings.browserArtifactsAfterDays}
759+
onChange={(browserArtifactsAfterDays) => update({ browserArtifactsAfterDays })}
760+
/>
761+
}
762+
/>
763+
</AnimatedHeight>
764+
<AnimatedHeight>
765+
<SettingsRow
766+
title="Delete old rotated logs"
767+
status={logsStatus}
768+
description="Delete inactive rotated log files after this many days. Current logs are kept."
769+
serverScoped
770+
control={
771+
<RetentionControl
772+
label="Delete old rotated logs"
773+
value={settings.logsAfterDays}
774+
onChange={(logsAfterDays) => update({ logsAfterDays })}
775+
/>
776+
}
777+
/>
778+
</AnimatedHeight>
754779
</SettingsSection>
755780
<CleanupSection />
756781
</>

0 commit comments

Comments
 (0)