Skip to content

Commit b80c4d6

Browse files
t3dotggclaude
andcommitted
fix(web): fold skipped machines in the update dialog
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 6705698 commit b80c4d6

1 file changed

Lines changed: 82 additions & 54 deletions

File tree

‎apps/web/src/components/sidebar/UpdateEverythingDialog.tsx‎

Lines changed: 82 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { useAtomValue } from "@effect/atom-react";
22
import { EnvironmentId } from "@t3tools/contracts";
33
import { Atom } from "effect/reactivity";
4-
import { Fragment } from "react";
4+
import { ChevronRightIcon } from "lucide-react";
5+
import { Fragment, type RefObject, useRef } from "react";
56

6-
import { cn } from "~/lib/utils";
77
import { environmentThreadShells } from "~/state/threads";
88
import {
99
AlertDialog,
@@ -15,6 +15,7 @@ import {
1515
AlertDialogTitle,
1616
} from "../ui/alert-dialog";
1717
import { Button } from "../ui/button";
18+
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
1819
import { MiddleTruncate } from "../ui/middle-truncate";
1920
import { ScrollArea } from "../ui/scroll-area";
2021
import type { RestartingMachine, UpdateEverythingRow } from "./updateEverything.logic";
@@ -48,19 +49,28 @@ interface UpdateEverythingDialogProps {
4849
readonly onConfirm: () => void;
4950
}
5051

52+
type UpdateEverythingDialogContentProps = Omit<
53+
UpdateEverythingDialogProps,
54+
"open" | "onOpenChange"
55+
> & {
56+
readonly cancelRef: RefObject<HTMLButtonElement | null>;
57+
};
58+
5159
export function UpdateEverythingDialog({
5260
open,
5361
onOpenChange,
5462
...content
5563
}: UpdateEverythingDialogProps) {
64+
const cancelRef = useRef<HTMLButtonElement>(null);
5665
return (
5766
<AlertDialog open={open} onOpenChange={onOpenChange}>
5867
{/* Refocusing the trigger after a pointer close shows its focus ring and opens its tooltip. */}
5968
<AlertDialogPopup
6069
className="sm:max-w-xl"
70+
initialFocus={cancelRef}
6171
finalFocus={(closeType) => closeType === "keyboard"}
6272
>
63-
<UpdateEverythingDialogContent {...content} />
73+
<UpdateEverythingDialogContent {...content} cancelRef={cancelRef} />
6474
</AlertDialogPopup>
6575
</AlertDialog>
6676
);
@@ -78,7 +88,8 @@ function UpdateEverythingDialogContent({
7888
rows,
7989
restarts,
8090
onConfirm,
81-
}: Omit<UpdateEverythingDialogProps, "open" | "onOpenChange">) {
91+
cancelRef,
92+
}: UpdateEverythingDialogContentProps) {
8293
const stopped = useAtomValue(
8394
runningThreadCountAtom(
8495
restarts
@@ -98,13 +109,14 @@ function UpdateEverythingDialogContent({
98109
const running = stopped + continuing;
99110
const threads = `${running} running ${running === 1 ? "thread" : "threads"}`;
100111
const restarting = new Set(restarts.map((machine) => machine.environmentId));
101-
const machineCount = rows.filter((row) => row.app !== null || row.providers.length > 0).length;
112+
const updating = rows.filter((row) => row.app !== null || row.providers.length > 0);
113+
const skipped = rows.filter((row) => row.skipped !== null);
102114

103115
return (
104116
<>
105117
<AlertDialogHeader className="shrink-0">
106118
<AlertDialogTitle>
107-
Update {machineCount} {machineCount === 1 ? "machine" : "machines"}?
119+
Update {updating.length} {updating.length === 1 ? "machine" : "machines"}?
108120
</AlertDialogTitle>
109121
<AlertDialogDescription>
110122
{version !== null ? (
@@ -119,54 +131,68 @@ function UpdateEverythingDialogContent({
119131
</AlertDialogDescription>
120132
</AlertDialogHeader>
121133
<ScrollArea scrollFade>
122-
{/* Machine names truncate first. Provider lists wrap between names, never inside one. */}
123-
<div className="grid grid-cols-[minmax(4rem,max-content)_max-content_minmax(min-content,1fr)_max-content] gap-x-4 px-6 pb-4 text-sm">
124-
<div className="col-span-full grid grid-cols-subgrid border-b pb-1.5 text-muted-foreground text-xs">
125-
<span>Machine</span>
126-
<span>T3 Code</span>
127-
<span>Providers</span>
128-
<span />
129-
</div>
130-
{rows.map((row) => (
131-
<div
132-
key={row.environmentId ?? "this-app"}
133-
className={cn(
134-
"col-span-full grid grid-cols-subgrid border-b border-border/50 py-1.5 last:border-b-0",
135-
row.app === null && row.providers.length === 0 && "text-muted-foreground",
136-
)}
137-
>
138-
<span className="max-w-32 min-w-0">
139-
<MiddleTruncate value={row.label} />
140-
</span>
141-
<span>
142-
{row.app !== null ? APP_LABELS[row.app] : null}
143-
{row.app === null && row.skipped !== null ? (
144-
<span className="text-muted-foreground">Skipped</span>
145-
) : null}
146-
{row.app === "this-app" ? (
147-
<span className="block text-muted-foreground text-xs">restarts last</span>
148-
) : null}
149-
</span>
150-
<span>
151-
{row.providers.map((provider, index) => (
152-
<Fragment key={provider}>
153-
<span className="whitespace-nowrap">{provider}</span>
154-
{index < row.providers.length - 1 ? ", " : null}
155-
</Fragment>
156-
))}
157-
</span>
158-
<span className="text-right">
159-
{row.environmentId !== null && restarting.has(row.environmentId) ? (
160-
<RunningThreads environmentId={row.environmentId} />
161-
) : null}
162-
</span>
163-
{row.skipped !== null ? (
164-
<span className="wrap-anywhere col-[2/-1] text-muted-foreground text-xs">
165-
{row.skipped}
166-
</span>
167-
) : null}
134+
<div className="flex flex-col gap-3 px-6 pb-4">
135+
{/* Machine names truncate first. Provider lists wrap between names, never inside one. */}
136+
<div className="grid grid-cols-[minmax(4rem,max-content)_max-content_minmax(min-content,1fr)_max-content] gap-x-4 text-sm">
137+
<div className="col-span-full grid grid-cols-subgrid border-b pb-1.5 text-muted-foreground text-xs">
138+
<span>Machine</span>
139+
<span>T3 Code</span>
140+
<span>Providers</span>
141+
<span />
168142
</div>
169-
))}
143+
{updating.map((row) => (
144+
<div
145+
key={row.environmentId ?? "this-app"}
146+
className="col-span-full grid grid-cols-subgrid border-b border-border/50 py-1.5 last:border-b-0"
147+
>
148+
<span className="max-w-32 min-w-0">
149+
<MiddleTruncate value={row.label} />
150+
</span>
151+
<span>
152+
{row.app !== null ? APP_LABELS[row.app] : null}
153+
{row.app === null && row.skipped !== null ? (
154+
<span className="text-muted-foreground">Skipped</span>
155+
) : null}
156+
{row.app === "this-app" ? (
157+
<span className="block text-muted-foreground text-xs">restarts last</span>
158+
) : null}
159+
</span>
160+
<span>
161+
{row.providers.map((provider, index) => (
162+
<Fragment key={provider}>
163+
<span className="whitespace-nowrap">{provider}</span>
164+
{index < row.providers.length - 1 ? ", " : null}
165+
</Fragment>
166+
))}
167+
</span>
168+
<span className="text-right">
169+
{row.environmentId !== null && restarting.has(row.environmentId) ? (
170+
<RunningThreads environmentId={row.environmentId} />
171+
) : null}
172+
</span>
173+
</div>
174+
))}
175+
</div>
176+
{skipped.length > 0 ? (
177+
<Collapsible>
178+
<CollapsibleTrigger className="flex items-center gap-1 text-muted-foreground text-xs hover:text-foreground data-panel-open:[&_svg]:rotate-90">
179+
<ChevronRightIcon className="size-3.5 transition-transform" aria-hidden />
180+
{skipped.length} skipped
181+
</CollapsibleTrigger>
182+
<CollapsiblePanel>
183+
<div className="grid grid-cols-[minmax(0,max-content)_1fr] gap-x-3 gap-y-0.5 pt-1.5 ps-4.5 text-muted-foreground text-xs">
184+
{skipped.map((row) => (
185+
<Fragment key={row.environmentId ?? "this-app"}>
186+
<span className="max-w-32 min-w-0">
187+
<MiddleTruncate value={row.label} />
188+
</span>
189+
<span className="wrap-anywhere">{row.skipped}</span>
190+
</Fragment>
191+
))}
192+
</div>
193+
</CollapsiblePanel>
194+
</Collapsible>
195+
) : null}
170196
</div>
171197
</ScrollArea>
172198
<AlertDialogFooter>
@@ -179,7 +205,9 @@ function UpdateEverythingDialogContent({
179205
: `${threads} will be interrupted. ${continuing} can resume after the restart.`}
180206
</p>
181207
) : null}
182-
<AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
208+
<AlertDialogClose ref={cancelRef} render={<Button variant="outline" />}>
209+
Cancel
210+
</AlertDialogClose>
183211
<Button onClick={onConfirm}>Update</Button>
184212
</AlertDialogFooter>
185213
</>

0 commit comments

Comments
 (0)