Skip to content

Commit edc8efe

Browse files
committed
refactor(servers): replace DropdownMenuItem with Button for Setup Server action
- Updated the SetupServer component to use a Button instead of DropdownMenuItem for better accessibility and user experience. - Enhanced the ShowServers component by adding tooltips for the Setup Server action, providing users with additional context on server configuration.
1 parent 4e0cb2a commit edc8efe

2 files changed

Lines changed: 31 additions & 25 deletions

File tree

apps/dokploy/components/dashboard/settings/servers/setup-server.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
DialogTitle,
2323
DialogTrigger,
2424
} from "@/components/ui/dialog";
25-
import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
2625
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
2726
import { cn } from "@/lib/utils";
2827
import { api } from "@/utils/api";
@@ -89,15 +88,15 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
8988
</Button>
9089
</DialogTrigger>
9190
) : (
92-
<DropdownMenuItem
91+
<Button
9392
className="w-full cursor-pointer "
94-
onSelect={(e) => {
95-
e.preventDefault();
93+
size="sm"
94+
onClick={() => {
9695
setIsOpen(true);
9796
}}
9897
>
99-
Setup Server
100-
</DropdownMenuItem>
98+
Setup Server <Settings className="size-4" />
99+
</Button>
101100
)}
102101
<DialogContent className="sm:max-w-4xl ">
103102
<DialogHeader>

apps/dokploy/components/dashboard/settings/servers/show-servers.tsx

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import {
66
Loader2,
77
MoreHorizontal,
88
Network,
9-
Pencil,
109
ServerIcon,
11-
Settings,
1210
Terminal,
1311
Trash2,
1412
User,
@@ -31,9 +29,7 @@ import {
3129
import {
3230
DropdownMenu,
3331
DropdownMenuContent,
34-
DropdownMenuItem,
3532
DropdownMenuLabel,
36-
DropdownMenuSeparator,
3733
DropdownMenuTrigger,
3834
} from "@/components/ui/dropdown-menu";
3935
import {
@@ -285,7 +281,32 @@ export const ShowServers = () => {
285281

286282
{/* Compact Actions */}
287283
{isActive && (
288-
<div className="flex items-center gap-2 pt-3 border-t mt-auto">
284+
<div className="flex items-center gap-2 pt-3 border-t mt-auto flex-wrap">
285+
<div className="flex items-center gap-2 w-full">
286+
<Tooltip>
287+
<TooltipTrigger asChild>
288+
<SetupServer
289+
serverId={server.serverId}
290+
/>
291+
</TooltipTrigger>
292+
<TooltipContent
293+
className="max-w-xs"
294+
side="bottom"
295+
>
296+
<div className="space-y-1">
297+
<p className="font-semibold">
298+
Setup Server
299+
</p>
300+
<p className="text-xs text-muted-foreground">
301+
Configure and initialize your
302+
server with Docker, Traefik, and
303+
other essential services
304+
</p>
305+
</div>
306+
</TooltipContent>
307+
</Tooltip>
308+
</div>
309+
289310
<TooltipProvider>
290311
{server.sshKeyId && (
291312
<Tooltip>
@@ -311,20 +332,6 @@ export const ShowServers = () => {
311332
</Tooltip>
312333
)}
313334

314-
<Tooltip>
315-
<TooltipTrigger asChild>
316-
<div>
317-
<SetupServer
318-
serverId={server.serverId}
319-
asButton={true}
320-
/>
321-
</div>
322-
</TooltipTrigger>
323-
<TooltipContent>
324-
<p>Setup Server</p>
325-
</TooltipContent>
326-
</Tooltip>
327-
328335
<Tooltip>
329336
<TooltipTrigger asChild>
330337
<div>

0 commit comments

Comments
 (0)