Skip to content

Commit 95b8bc6

Browse files
committed
fix(desktop): preserve queued update actions
1 parent 1e76c27 commit 95b8bc6

5 files changed

Lines changed: 56 additions & 2 deletions

File tree

‎apps/desktop/src/updates/DesktopUpdates.test.ts‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,11 @@ describe("DesktopUpdates", () => {
345345
const updates = yield* DesktopUpdates.DesktopUpdates;
346346
yield* updates.configure;
347347

348+
harness.emit("update-available", {
349+
version: "1.2.4",
350+
releaseNotes: "## What's changed\n- fix: queued update",
351+
});
352+
yield* flushCallbacks;
348353
harness.emit("update-downloaded", { version: "1.2.4" });
349354
yield* flushCallbacks;
350355

@@ -357,6 +362,9 @@ describe("DesktopUpdates", () => {
357362
const unchangedState = yield* updates.getState;
358363
assert.equal(unchangedState.status, "downloaded");
359364
assert.equal(unchangedState.downloadedVersion, "1.2.4");
365+
assert.deepEqual(unchangedState.releaseNotes, [
366+
{ version: "1.2.4", items: ["fix: queued update"] },
367+
]);
360368

361369
const nextResult = yield* updates.check("poll");
362370
assert.isTrue(nextResult.checked);
@@ -435,6 +443,27 @@ describe("DesktopUpdates", () => {
435443
).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
436444
});
437445

446+
it.effect("preserves a queued installer after a background updater error", () => {
447+
const harness = makeHarness();
448+
449+
return Effect.scoped(
450+
Effect.gen(function* () {
451+
const updates = yield* DesktopUpdates.DesktopUpdates;
452+
yield* updates.configure;
453+
harness.emit("update-downloaded", { version: "1.2.4" });
454+
yield* flushCallbacks;
455+
456+
harness.emit("error", new Error("background updater failure"));
457+
yield* flushCallbacks;
458+
459+
const state = yield* updates.getState;
460+
assert.equal(state.status, "error");
461+
assert.equal(state.downloadedVersion, "1.2.4");
462+
assert.isNull(state.errorContext);
463+
}),
464+
).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
465+
});
466+
438467
it.effect("logs bounded updater failure context without exposing the cause", () => {
439468
const cause = new Error(
440469
"request failed for https://user:[email protected]/update?token=secret",

‎apps/desktop/src/updates/updateMachine.test.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,15 @@ describe("updateMachine", () => {
8585
});
8686

8787
it("keeps the installer when the feed still offers its version", () => {
88+
const releaseNotes = [{ version: "1.1.0", items: ["fix: queued update"] }];
8889
const state = reduceDesktopUpdateStateOnUpdateAvailable(
8990
{
9091
...createInitialDesktopUpdateState("1.0.0", runtimeInfo, "latest"),
9192
enabled: true,
9293
status: "downloaded",
9394
availableVersion: "1.1.0",
9495
downloadedVersion: "1.1.0",
96+
releaseNotes,
9597
downloadPercent: 100,
9698
},
9799
"1.1.0",
@@ -100,6 +102,7 @@ describe("updateMachine", () => {
100102

101103
expect(state.status).toBe("downloaded");
102104
expect(state.downloadedVersion).toBe("1.1.0");
105+
expect(state.releaseNotes).toBe(releaseNotes);
103106
expect(state.downloadPercent).toBe(100);
104107
});
105108

‎apps/desktop/src/updates/updateMachine.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ export function reduceDesktopUpdateStateOnUpdateAvailable(
9191
releaseNotes: ReadonlyArray<DesktopUpdateReleaseNote> = [],
9292
): DesktopUpdateState {
9393
const isDownloadedVersion = state.downloadedVersion === version;
94+
const nextReleaseNotes =
95+
isDownloadedVersion && releaseNotes.length === 0 ? state.releaseNotes : releaseNotes;
9496
return {
9597
...state,
9698
status: isDownloadedVersion ? "downloaded" : "available",
9799
availableVersion: version,
98100
downloadedVersion: isDownloadedVersion ? version : null,
99-
releaseNotes,
101+
releaseNotes: nextReleaseNotes,
100102
downloadPercent: isDownloadedVersion ? 100 : null,
101103
checkedAt,
102104
message: null,

‎apps/web/src/components/desktopUpdate.logic.test.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,21 @@ describe("desktop update button state", () => {
7373
expect(getDesktopUpdateButtonTooltip(state)).toContain("Click to retry");
7474
});
7575

76+
it("keeps install action available after a background updater error", () => {
77+
const state: DesktopUpdateState = {
78+
...baseState,
79+
status: "error",
80+
downloadedVersion: "1.1.0",
81+
availableVersion: "1.1.0",
82+
message: "background updater error",
83+
errorContext: null,
84+
canRetry: true,
85+
};
86+
expect(shouldShowDesktopUpdateButton(state)).toBe(true);
87+
expect(resolveDesktopUpdateButtonAction(state)).toBe("install");
88+
expect(getDesktopUpdateButtonTooltip(state)).toContain("Click to restart and install");
89+
});
90+
7691
it("prefers a newly available release over a stale downloaded version", () => {
7792
const state: DesktopUpdateState = {
7893
...baseState,

‎apps/web/src/components/desktopUpdate.logic.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ export function resolveDesktopUpdateButtonAction(
2626
): DesktopUpdateButtonAction {
2727
if (
2828
state.downloadedVersion &&
29-
(state.status === "downloaded" || state.errorContext === "install")
29+
(state.status === "downloaded" ||
30+
(state.status === "error" &&
31+
(state.errorContext === null || state.errorContext === "install")))
3032
) {
3133
return "install";
3234
}
@@ -93,6 +95,9 @@ export function getDesktopUpdateButtonTooltip(state: DesktopUpdateState): string
9395
if (state.errorContext === "install" && state.downloadedVersion) {
9496
return `Install failed for ${state.downloadedVersion}. Click to retry.`;
9597
}
98+
if (state.downloadedVersion) {
99+
return `Update ${state.downloadedVersion} downloaded. Click to restart and install.`;
100+
}
96101
return state.message ?? "Update failed";
97102
}
98103
return "Up to date";

0 commit comments

Comments
 (0)