a54c7dc1f4
* fix(plugins): align install-dialog footer actions The install dialog rendered a per-tab "Install" button inside each tab body (left-aligned, under the input/dropzone) while DialogFooter held only Cancel (right-aligned), so the two actions landed on different rows and looked broken. Lift the tab, url, and file state into InstallPluginDialog and render a single DialogFooter with Cancel (outline) + Install (primary). The Install button's testid, handler, and disabled state derive from the active tab, preserving both install-plugin-url-submit and install-plugin-upload-submit selectors. Install is the sole primary so the base DialogContent fires it on Enter. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(plugins): reset install-dialog inputs on close A successful install closes the dialog by flipping the controlled `open` prop directly (usePluginActions.afterInstall -> closeInstallDialog), which never routes through onOpenChange. With the tab/url/file state now lifted into InstallPluginDialog, the previous reset-in-handleOpenChange approach left a stale file/url selected the next time the dialog opened, making an accidental re-upload possible. Reset the lifted state from an effect keyed on `open` so every close path (programmatic close, Cancel, Escape, overlay) clears it. Adds a regression test covering upload-install -> reopen -> empty state. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Kandev Agent <agent@kandev.dev> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
219 lines
6.6 KiB
TypeScript
219 lines
6.6 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect, useRef, useState } from "react";
|
|
import { Button } from "@kandev/ui/button";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from "@kandev/ui/dialog";
|
|
import { Input } from "@kandev/ui/input";
|
|
import { Label } from "@kandev/ui/label";
|
|
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@kandev/ui/tabs";
|
|
import { cn } from "@/lib/utils";
|
|
|
|
type InstallTab = "url" | "upload";
|
|
|
|
type InstallPluginDialogProps = {
|
|
open: boolean;
|
|
busy: boolean;
|
|
error: string | null;
|
|
onOpenChange: (open: boolean) => void;
|
|
onSubmitUrl: (url: string) => void;
|
|
onSubmitFile: (file: File) => void;
|
|
};
|
|
|
|
/**
|
|
* Replaces the old "Register plugin" manifest-paste dialog with the
|
|
* install-based flow (docs/plans/plugins/GRPC-CONTRACT.md §7): install from a
|
|
* remote tarball URL, or upload a .tar.gz package directly. No credentials
|
|
* are ever shown — installing a plugin has nothing to copy or reveal.
|
|
*/
|
|
export function InstallPluginDialog({
|
|
open,
|
|
busy,
|
|
error,
|
|
onOpenChange,
|
|
onSubmitUrl,
|
|
onSubmitFile,
|
|
}: InstallPluginDialogProps) {
|
|
const [tab, setTab] = useState<InstallTab>("url");
|
|
const [url, setUrl] = useState("");
|
|
const [file, setFile] = useState<File | null>(null);
|
|
|
|
// Reset the lifted input state whenever the dialog closes. This keys off the
|
|
// `open` prop rather than `onOpenChange` because a successful install closes
|
|
// the dialog by flipping the controlled `open` prop directly
|
|
// (usePluginActions.afterInstall), which never routes through onOpenChange —
|
|
// so resetting only in an onOpenChange handler would leave a stale file/url
|
|
// selected the next time the dialog opens.
|
|
useEffect(() => {
|
|
if (!open) {
|
|
setUrl("");
|
|
setFile(null);
|
|
setTab("url");
|
|
}
|
|
}, [open]);
|
|
|
|
const trimmedUrl = url.trim();
|
|
// The single Install button submits whichever tab is active; its testid,
|
|
// handler, and disabled state all derive from `tab` so the e2e/unit selectors
|
|
// (install-plugin-url-submit / install-plugin-upload-submit) keep working.
|
|
const install =
|
|
tab === "url"
|
|
? {
|
|
testId: "install-plugin-url-submit",
|
|
onClick: () => onSubmitUrl(trimmedUrl),
|
|
disabled: busy || trimmedUrl.length === 0,
|
|
}
|
|
: {
|
|
testId: "install-plugin-upload-submit",
|
|
onClick: () => file && onSubmitFile(file),
|
|
disabled: busy || !file,
|
|
};
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="sm:max-w-lg" data-testid="install-plugin-dialog">
|
|
<DialogHeader>
|
|
<DialogTitle>Install plugin</DialogTitle>
|
|
<DialogDescription>
|
|
Install a plugin package from a URL, or upload a .tar.gz file directly.
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
<Tabs value={tab} onValueChange={(v) => setTab(v as InstallTab)}>
|
|
<TabsList>
|
|
<TabsTrigger
|
|
value="url"
|
|
className="cursor-pointer"
|
|
data-testid="install-plugin-tab-url"
|
|
>
|
|
From URL
|
|
</TabsTrigger>
|
|
<TabsTrigger
|
|
value="upload"
|
|
className="cursor-pointer"
|
|
data-testid="install-plugin-tab-upload"
|
|
>
|
|
Upload file
|
|
</TabsTrigger>
|
|
</TabsList>
|
|
<TabsContent value="url" className="pt-3">
|
|
<UrlTab url={url} setUrl={setUrl} />
|
|
</TabsContent>
|
|
<TabsContent value="upload" className="pt-3">
|
|
<UploadTab file={file} setFile={setFile} />
|
|
</TabsContent>
|
|
</Tabs>
|
|
|
|
{error && (
|
|
<div data-testid="install-plugin-error" className="text-xs text-destructive" role="alert">
|
|
{error}
|
|
</div>
|
|
)}
|
|
|
|
<DialogFooter>
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
onClick={() => onOpenChange(false)}
|
|
className="cursor-pointer"
|
|
>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
type="button"
|
|
data-testid={install.testId}
|
|
onClick={install.onClick}
|
|
disabled={install.disabled}
|
|
className="cursor-pointer"
|
|
>
|
|
Install
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|
|
|
|
function UrlTab({ url, setUrl }: { url: string; setUrl: (v: string) => void }) {
|
|
return (
|
|
<div className="space-y-1.5">
|
|
<Label htmlFor="install-plugin-url">Package URL</Label>
|
|
<Input
|
|
id="install-plugin-url"
|
|
data-testid="install-plugin-url-input"
|
|
value={url}
|
|
onChange={(e) => setUrl(e.target.value)}
|
|
placeholder="https://example.com/acme-tools-1.0.0.tar.gz"
|
|
className="font-mono text-sm"
|
|
/>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function UploadTab({ file, setFile }: { file: File | null; setFile: (file: File | null) => void }) {
|
|
const inputRef = useRef<HTMLInputElement>(null);
|
|
const [isDragging, setIsDragging] = useState(false);
|
|
|
|
const handleDragOver = (e: React.DragEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
};
|
|
|
|
const handleDragEnter = (e: React.DragEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
if (e.dataTransfer.types.includes("Files")) setIsDragging(true);
|
|
};
|
|
|
|
const handleDragLeave = (e: React.DragEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
setIsDragging(false);
|
|
};
|
|
|
|
const handleDrop = (e: React.DragEvent) => {
|
|
e.preventDefault();
|
|
e.stopPropagation();
|
|
setIsDragging(false);
|
|
const dropped = e.dataTransfer.files[0];
|
|
if (dropped) setFile(dropped);
|
|
};
|
|
|
|
return (
|
|
<div
|
|
data-testid="install-plugin-dropzone"
|
|
onDragOver={handleDragOver}
|
|
onDragEnter={handleDragEnter}
|
|
onDragLeave={handleDragLeave}
|
|
onDrop={handleDrop}
|
|
onClick={() => inputRef.current?.click()}
|
|
className={cn(
|
|
"flex flex-col items-center justify-center gap-2 rounded-lg border border-dashed border-border/70 p-6 text-center text-sm text-muted-foreground cursor-pointer",
|
|
isDragging && "border-primary bg-primary/5 ring-1 ring-primary/30",
|
|
)}
|
|
>
|
|
<span>
|
|
{file ? (
|
|
<span className="font-mono text-foreground">{file.name}</span>
|
|
) : (
|
|
"Drag and drop a .tar.gz package here, or click to browse"
|
|
)}
|
|
</span>
|
|
<input
|
|
ref={inputRef}
|
|
type="file"
|
|
accept=".tar.gz,.tgz,application/gzip"
|
|
data-testid="install-plugin-file-input"
|
|
onChange={(e) => setFile(e.target.files?.[0] ?? null)}
|
|
className="hidden"
|
|
/>
|
|
</div>
|
|
);
|
|
}
|