fix(ui): show env var input section for manual CLI credentials (#514)

When adding a CLI credential with "Manual (no preset)" mode, the env var
input section was hidden because it only rendered when a preset was
selected. Add a dynamic key-value form allowing users to define custom
environment variables for non-preset CLI tools.

Closes #477
This commit is contained in:
Thieu Nguyen authored and GitHub committed 2026-03-27 21:50:31 +07:00
1 parent be9044ca8e
commit c0dfea35ea
4 files changed
+100 -7

No files matched your search

@@ -33,7 +33,11 @@
"agentIdHint": "optional — leave blank for global",
"commaSeparated": "comma-separated",
"binaryNameRequired": "Binary name is required.",
"failedToSave": "Failed to save."
"failedToSave": "Failed to save.",
"addEnvVar": "Add Variable",
"noEnvVarsHint": "Click \"Add Variable\" to define environment variables for this CLI tool.",
"envKeyPlaceholder": "ENV_VAR_NAME",
"envValuePlaceholder": "value"
},
"placeholders": {
"binaryName": "e.g. gh",
@@ -33,7 +33,11 @@
"agentIdHint": "tùy chọn — để trống cho toàn cục",
"commaSeparated": "phân cách bằng dấu phẩy",
"binaryNameRequired": "Tên binary là bắt buộc.",
"failedToSave": "Không thể lưu."
"failedToSave": "Không thể lưu.",
"addEnvVar": "Thêm biến",
"noEnvVarsHint": "Nhấn \"Thêm biến\" để khai báo biến môi trường cho công cụ CLI này.",
"envKeyPlaceholder": "TÊN_BIẾN",
"envValuePlaceholder": "giá trị"
},
"placeholders": {
"binaryName": "vd: gh",
@@ -33,7 +33,11 @@
"agentIdHint": "可选 — 留空表示全局",
"commaSeparated": "逗号分隔",
"binaryNameRequired": "二进制名称为必填项。",
"failedToSave": "保存失败。"
"failedToSave": "保存失败。",
"addEnvVar": "添加变量",
"noEnvVarsHint": "点击\"添加变量\"为此 CLI 工具定义环境变量。",
"envKeyPlaceholder": "变量名",
"envValuePlaceholder": "值"
},
"placeholders": {
"binaryName": "例如 gh",
@@ -1,4 +1,4 @@
import { useState, useEffect } from "react";
import { useState, useEffect, useCallback } from "react";
import { useTranslation } from "react-i18next";
import {
Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle,
@@ -11,8 +11,14 @@ import { Switch } from "@/components/ui/switch";
import {
Select, SelectContent, SelectItem, SelectTrigger, SelectValue,
} from "@/components/ui/select";
import { Plus, X } from "lucide-react";
import type { SecureCLIBinary, CLICredentialInput, CLIPreset } from "./hooks/use-cli-credentials";
interface ManualEnvEntry {
key: string;
value: string;
}
interface Props {
open: boolean;
onOpenChange: (open: boolean) => void;
@@ -38,19 +44,20 @@ export function CliCredentialFormDialog({ open, onOpenChange, credential, preset
const [agentId, setAgentId] = useState("");
const [enabled, setEnabled] = useState(true);
const [envValues, setEnvValues] = useState<Record<string, string>>({});
const [manualEnvEntries, setManualEnvEntries] = useState<ManualEnvEntry[]>([]);
const [loading, setLoading] = useState(false);
const [error, setError] = useState("");
const isEdit = !!credential;
// Build typed entry list to avoid noUncheckedIndexedAccess issues
const presetEntries: Array<[string, CLIPreset]> = Object.entries(presets).filter(
(e): e is [string, CLIPreset] => e[1] !== undefined,
);
// Current preset definition (for env var fields)
const activePreset: CLIPreset | null =
selectedPreset !== NONE_PRESET ? (presets[selectedPreset] ?? null) : null;
const isManualMode = selectedPreset === NONE_PRESET;
useEffect(() => {
if (!open) return;
setSelectedPreset(NONE_PRESET);
@@ -64,6 +71,7 @@ export function CliCredentialFormDialog({ open, onOpenChange, credential, preset
setAgentId(credential?.agent_id ?? "");
setEnabled(credential?.enabled ?? true);
setEnvValues({});
setManualEnvEntries([]);
setError("");
}, [open, credential]);
@@ -79,11 +87,36 @@ export function CliCredentialFormDialog({ open, onOpenChange, credential, preset
setTimeout(p.timeout);
setTips(p.tips);
setEnvValues({});
setManualEnvEntries([]);
};
const addManualEnvEntry = useCallback(() => {
setManualEnvEntries((prev) => [...prev, { key: "", value: "" }]);
}, []);
const removeManualEnvEntry = useCallback((index: number) => {
setManualEnvEntries((prev) => prev.filter((_, i) => i !== index));
}, []);
const updateManualEnvEntry = useCallback((index: number, field: "key" | "value", val: string) => {
setManualEnvEntries((prev) =>
prev.map((entry, i) => (i === index ? { ...entry, [field]: val } : entry)),
);
}, []);
const splitCommaList = (v: string): string[] =>
v.split(",").map((s) => s.trim()).filter(Boolean);
const buildEnvPayload = (): Record<string, string> => {
if (!isManualMode) return envValues;
const env: Record<string, string> = {};
for (const entry of manualEnvEntries) {
const k = entry.key.trim();
if (k && entry.value) env[k] = entry.value;
}
return env;
};
const handleSubmit = async () => {
if (!binaryName.trim()) {
setError(t("form.binaryNameRequired"));
@@ -104,7 +137,8 @@ export function CliCredentialFormDialog({ open, onOpenChange, credential, preset
enabled,
};
if (selectedPreset !== NONE_PRESET) payload.preset = selectedPreset;
if (Object.keys(envValues).length > 0) payload.env = envValues;
const env = buildEnvPayload();
if (Object.keys(env).length > 0) payload.env = env;
await onSubmit(payload);
onOpenChange(false);
} catch (err) {
@@ -179,6 +213,53 @@ export function CliCredentialFormDialog({ open, onOpenChange, credential, preset
</div>
)}
{/* Manual env var entries (no preset selected) */}
{isManualMode && (
<div className="grid gap-3 rounded-md border p-3">
<div className="flex items-center justify-between">
<p className="text-sm font-medium">{t("form.envVars")}</p>
<Button type="button" variant="outline" size="sm" onClick={addManualEnvEntry}>
<Plus className="mr-1 h-3.5 w-3.5" />
{t("form.addEnvVar")}
</Button>
</div>
{manualEnvEntries.length === 0 && (
<p className="text-xs text-muted-foreground">{t("form.noEnvVarsHint")}</p>
)}
{manualEnvEntries.map((entry, idx) => (
<div key={idx} className="flex items-start gap-2">
<div className="grid flex-1 gap-1.5">
<Input
placeholder={t("form.envKeyPlaceholder")}
value={entry.key}
onChange={(e) => updateManualEnvEntry(idx, "key", e.target.value)}
className="text-base md:text-sm font-mono"
/>
</div>
<div className="grid flex-1 gap-1.5">
<Input
type="password"
autoComplete="off"
placeholder={t("form.envValuePlaceholder")}
value={entry.value}
onChange={(e) => updateManualEnvEntry(idx, "value", e.target.value)}
className="text-base md:text-sm"
/>
</div>
<Button
type="button"
variant="ghost"
size="icon"
className="mt-0.5 h-8 w-8 shrink-0"
onClick={() => removeManualEnvEntry(idx)}
>
<X className="h-4 w-4" />
</Button>
</div>
))}
</div>
)}
<div className="grid grid-cols-1 gap-4 sm:grid-cols-2">
<div className="grid gap-1.5">
<Label htmlFor="cc-name">{t("form.binaryName")}</Label>