Skip to content

Commit 5246c56

Browse files
fix(web): avoid duplicate Antigravity install status
1 parent fff33f9 commit 5246c56

2 files changed

Lines changed: 51 additions & 15 deletions

File tree

‎apps/web/src/components/settings/ProviderSetupSection.test.tsx‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { FunctionComponent, ReactElement } from "react";
1+
import { isValidElement, type FunctionComponent, type ReactElement } from "react";
22
import {
33
EnvironmentId,
44
ProviderDriverKind,
@@ -142,6 +142,23 @@ function button(view: unknown, label: string) {
142142
);
143143
}
144144

145+
function countElements(
146+
node: unknown,
147+
predicate: (element: ReactElement<Record<string, unknown>>) => boolean,
148+
): number {
149+
if (Array.isArray(node)) {
150+
return node.reduce((total, child) => total + countElements(child, predicate), 0);
151+
}
152+
if (!isValidElement<Record<string, unknown>>(node)) return 0;
153+
return (
154+
Number(predicate(node)) +
155+
Object.values(node.props).reduce<number>(
156+
(total, value) => total + countElements(value, predicate),
157+
0,
158+
)
159+
);
160+
}
161+
145162
function click(view: unknown, label: string) {
146163
const target = button(view, label);
147164
if (!target) throw new Error(`Missing button: ${label}`);
@@ -285,6 +302,23 @@ describe("Antigravity setup", () => {
285302
await flushPromises();
286303
});
287304

305+
it("shows a repeated runtime status message only once", () => {
306+
setup.installation = {
307+
...setup.installation!,
308+
operationId: "install-1",
309+
phase: "verifying",
310+
message: "Checking the downloaded runtime.",
311+
};
312+
313+
const view = renderSetup();
314+
expect(
315+
countElements(
316+
view,
317+
(element) => element.props.children === "Checking the downloaded runtime.",
318+
),
319+
).toBe(1);
320+
});
321+
288322
it("removes an owned damaged runtime only after confirmation", async () => {
289323
setup.auth = authState({ phase: "idle", flowId: null, authorizationUrl: null });
290324
setup.installation = {

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,20 @@ function ProviderSetupActions({
169169
const authorizationUrl = auth?.phase === "waiting" ? auth.authorizationUrl : null;
170170
const queryError = authQuery.error ?? installQuery.error;
171171
const actionsDisabled = pendingLabel !== null || queryError !== null;
172+
const installationStatusMessage =
173+
installation?.phase === "downloading"
174+
? `Downloading ${(installation.downloadedBytes / 1_000_000).toFixed(1)} MB${installation.totalBytes === null ? "" : ` of ${(installation.totalBytes / 1_000_000).toFixed(1)} MB`}.`
175+
: installation?.phase === "extracting"
176+
? "Extracting Antigravity."
177+
: installation?.phase === "verifying"
178+
? "Checking the downloaded runtime."
179+
: installed
180+
? "Antigravity is installed."
181+
: usesCustomBinary
182+
? enabled
183+
? "The configured Antigravity runtime is unavailable."
184+
: "The configured Antigravity runtime has not been checked."
185+
: "Install the official Antigravity runtime before signing in.";
172186

173187
async function runCommand<A, E>(
174188
label: string,
@@ -252,19 +266,7 @@ function ProviderSetupActions({
252266
<div className="grid gap-2">
253267
<p className="font-medium">Runtime</p>
254268
<p role="status" className="text-muted-foreground">
255-
{installation?.phase === "downloading"
256-
? `Downloading ${(installation.downloadedBytes / 1_000_000).toFixed(1)} MB${installation.totalBytes === null ? "" : ` of ${(installation.totalBytes / 1_000_000).toFixed(1)} MB`}.`
257-
: installation?.phase === "extracting"
258-
? "Extracting Antigravity."
259-
: installation?.phase === "verifying"
260-
? "Checking the downloaded runtime."
261-
: installed
262-
? "Antigravity is installed."
263-
: usesCustomBinary
264-
? enabled
265-
? "The configured Antigravity runtime is unavailable."
266-
: "The configured Antigravity runtime has not been checked."
267-
: "Install the official Antigravity runtime before signing in."}
269+
{installationStatusMessage}
268270
</p>
269271
{installation?.phase === "downloading" &&
270272
installation.totalBytes !== null &&
@@ -276,7 +278,7 @@ function ProviderSetupActions({
276278
max={installation.totalBytes}
277279
/>
278280
) : null}
279-
{installation?.message ? (
281+
{installation?.message && installation.message !== installationStatusMessage ? (
280282
<p className="text-muted-foreground [overflow-wrap:anywhere]">{installation.message}</p>
281283
) : null}
282284
{usesCustomBinary ? (

0 commit comments

Comments
 (0)