Skip to content

Commit cd5c57d

Browse files
PR Batch Testerclaude
andcommitted
fix(web): a saved unsupported server stays unselectable without a descriptor
The row only looked at discovery's compatibility error, so a saved server that is unsupported for good became selectable while discovery had no descriptor. The row and auto-selection now share one check that falls back to the saved update flag. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 71403bd commit cd5c57d

2 files changed

Lines changed: 42 additions & 8 deletions

File tree

‎apps/web/src/components/cloud/CloudEnvironmentConnectList.browser.test.tsx‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,33 @@ describe("cloud onboarding discovery", () => {
410410
expect(onChange).toHaveBeenCalledWith(newMachineId, false);
411411
});
412412

413+
it("keeps a saved unsupported server unselectable while discovery has no descriptor", async () => {
414+
const base = linkedMachines.get(newMachineId)!;
415+
discovery.listEnvironments.mockResolvedValue(
416+
new Map([[newMachineId, { ...base, availability: "offline" as const }]]),
417+
);
418+
await render(
419+
<CloudEnvironmentConnectRows
420+
primaryEnvironmentId={null}
421+
savedEnvironments={[
422+
{
423+
environmentId: newMachineId,
424+
relayManaged: true,
425+
connection: { phase: "unsupported", error: "Update your app.", traceId: null },
426+
entry: {},
427+
},
428+
]}
429+
showSavedEnvironments
430+
selection={{
431+
autoSelectedComputers: new Set(),
432+
selectedIds: new Set(),
433+
onChange: vi.fn(),
434+
}}
435+
/>,
436+
);
437+
expect(checkbox().hasAttribute("data-disabled")).toBe(true);
438+
});
439+
413440
it("connects and selects discovered computers by default without overwriting deselection", async () => {
414441
discovery.listEnvironments.mockResolvedValue(linkedMachines);
415442
const autoSelectedComputers = new Set<EnvironmentId>();

‎apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,16 @@ function OutdatedServerRowUpdate(props: {
8080
);
8181
}
8282

83+
/** Discovery loses the descriptor while a server restarts, so the saved flag answers then. */
84+
function updatableServer(
85+
error: ReturnType<typeof discoveredCompatibilityError>,
86+
saved: SavedCloudEnvironmentConnection | undefined,
87+
): boolean {
88+
return error !== null
89+
? error.serverUpdateRequired === true
90+
: saved?.entry?.serverUpdateRequired === true;
91+
}
92+
8393
export interface SavedCloudEnvironmentConnection {
8494
readonly environmentId: EnvironmentId;
8595
readonly connection: EnvironmentConnectionPresentation;
@@ -244,12 +254,9 @@ export function CloudEnvironmentConnectRows({
244254
if (compatibilityError !== null || saved?.connection.phase === "unsupported") {
245255
seen.add(id);
246256
// A server picked for an update keeps its selection, so setup includes it once updated.
247-
// Discovery loses the descriptor while it restarts, so the saved flag answers then.
248-
const updatable =
249-
compatibilityError !== null
250-
? compatibilityError.serverUpdateRequired === true
251-
: saved?.entry?.serverUpdateRequired === true;
252-
if (!updatable && selection.selectedIds.has(id)) selection.onChange(id, false);
257+
if (!updatableServer(compatibilityError, saved) && selection.selectedIds.has(id)) {
258+
selection.onChange(id, false);
259+
}
253260
continue;
254261
}
255262
if (seen.has(id)) continue;
@@ -353,8 +360,8 @@ export function CloudEnvironmentConnectRows({
353360
compatibilityError !== null || savedEnvironment?.connection.phase === "unsupported";
354361
const unsupportedDetail =
355362
compatibilityError?.message ?? savedEnvironment?.connection.error ?? null;
356-
const blocked = blocksAdding(compatibilityError);
357-
const updatable = compatibilityError?.serverUpdateRequired === true;
363+
const updatable = updatableServer(compatibilityError, savedEnvironment);
364+
const blocked = unsupported && !updatable;
358365
const savedConnection = unsupported
359366
? presentSavedCloudEnvironmentConnection({
360367
phase: "unsupported",

0 commit comments

Comments
 (0)