Skip to content

Improve secret key verification interface #151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
BennyKok wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Improve secret key verification interface #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 21 additions & 81 deletions src/components/machine/secrets-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import type React from "react";

import {
ArrowLeft,
Eye,
EyeOff,
KeyRound,
Link,
Link2Off,
Expand Down Expand Up @@ -59,12 +57,13 @@ import {
import { toast } from "sonner";
import { RebuildMachineDialog } from "../machines/machine-list";
import { Badge } from "../ui/badge";
import { PasswordInput } from "../ui/password-input";

export function SecretsSelector({ machine }: { machine: any }) {
const [visibleValues, setVisibleValues] = useState<Record<number, boolean>>(
{},
);
const [showNewValue, setShowNewValue] = useState(false);

const [isAddingSecret, setIsAddingSecret] = useState(false);
const [isEditingSecret, setIsEditingSecret] = useState(false);
const [newGroupName, setNewGroupName] = useState("");
Expand Down Expand Up @@ -317,9 +316,7 @@ export function SecretsSelector({ machine }: { machine: any }) {
}));
};

const toggleShowNewValue = () => {
setShowNewValue(!showNewValue);
};


const selectGroup = async (groupId: string) => {
try {
Expand Down Expand Up @@ -415,31 +412,12 @@ export function SecretsSelector({ machine }: { machine: any }) {
</div>
<div className="grid gap-2">
<Label htmlFor="secret-value">Value</Label>
<div className="relative">
<Input
id="secret-value"
value={newSecretValue}
onChange={(e) => setNewSecretValue(e.target.value)}
type={showNewValue ? "text" : "password"}
placeholder="Enter secret value"
/>
<Button
type="button"
variant="ghost"
size="sm"
className="absolute top-0 right-0 h-full px-3 py-2 text-muted-foreground"
onClick={toggleShowNewValue}
>
{showNewValue ? (
<EyeOff className="h-4 w-4" />
) : (
<Eye className="h-4 w-4" />
)}
<span className="sr-only">
{showNewValue ? "Hide" : "Show"} value
</span>
</Button>
</div>
<PasswordInput
id="secret-value"
value={newSecretValue}
onChange={(e) => setNewSecretValue(e.target.value)}
placeholder="Enter secret value"
/>
</div>
</div>
</div>
Expand Down Expand Up @@ -667,31 +645,12 @@ export function SecretsSelector({ machine }: { machine: any }) {
</div>
<div className="grid gap-2">
<Label htmlFor="secret-value">Value</Label>
<div className="relative">
<Input
id="secret-value"
value={newSecretValue}
onChange={(e) => setNewSecretValue(e.target.value)}
type={showNewValue ? "text" : "password"}
placeholder="Enter secret value"
/>
<Button
type="button"
variant="ghost"
size="sm"
className="absolute top-0 right-0 h-full px-3 py-2 text-muted-foreground"
onClick={toggleShowNewValue}
>
{showNewValue ? (
<EyeOff className="h-4 w-4" />
) : (
<Eye className="h-4 w-4" />
)}
<span className="sr-only">
{showNewValue ? "Hide" : "Show"} value
</span>
</Button>
</div>
<PasswordInput
id="secret-value"
value={newSecretValue}
onChange={(e) => setNewSecretValue(e.target.value)}
placeholder="Enter secret value"
/>
</div>
</div>
</div>
Expand Down Expand Up @@ -746,31 +705,12 @@ export function SecretsSelector({ machine }: { machine: any }) {
</div>
<div className="grid gap-2">
<Label htmlFor="edit-secret-value">Value</Label>
<div className="relative">
<Input
id="edit-secret-value"
value={editSecretValue}
onChange={(e) => setEditSecretValue(e.target.value)}
type={showNewValue ? "text" : "password"}
placeholder="Enter secret value"
/>
<Button
type="button"
variant="ghost"
size="sm"
className="absolute top-0 right-0 h-full px-3 py-2 text-muted-foreground"
onClick={toggleShowNewValue}
>
{showNewValue ? (
<EyeOff className="h-4 w-4" />
) : (
<Eye className="h-4 w-4" />
)}
<span className="sr-only">
{showNewValue ? "Hide" : "Show"} password
</span>
</Button>
</div>
<PasswordInput
id="edit-secret-value"
value={editSecretValue}
onChange={(e) => setEditSecretValue(e.target.value)}
placeholder="Enter secret value"
/>
</div>
</div>
</div>
Expand Down
64 changes: 64 additions & 0 deletions src/components/ui/password-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import type React from "react";
import { useState } from "react";
import { Eye, EyeOff } from "lucide-react";
import { Button } from "./button";
import { Input } from "./input";
import { cn } from "@/lib/utils";

export interface PasswordInputProps
extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "type"> {
showToggle?: boolean;
}

const PasswordInput = React.forwardRef<HTMLInputElement, PasswordInputProps>(
({ className, showToggle = true, ...props }, ref) => {
const [showPassword, setShowPassword] = useState(false);

const togglePasswordVisibility = () => {
setShowPassword((prev) => !prev);
};

if (!showToggle) {
return (
<Input
type="password"
className={className}
ref={ref}
{...props}
/>
);
}

return (
<div className="relative">
<Input
type={showPassword ? "text" : "password"}
className={cn("pr-10", className)}
ref={ref}
{...props}
/>
<Button
type="button"
variant="ghost"
size="sm"
className="absolute right-0 top-1/2 -translate-y-1/2 h-8 w-8 p-0 text-muted-foreground hover:text-foreground"
onClick={togglePasswordVisibility}
tabIndex={-1}
>
{showPassword ? (
<EyeOff className="h-4 w-4" />
) : (
<Eye className="h-4 w-4" />
)}
<span className="sr-only">
{showPassword ? "Hide" : "Show"} password
</span>
</Button>
</div>
);
},
);

PasswordInput.displayName = "PasswordInput";

export { PasswordInput };