From 1d5a523b9ebb5cb0c41ff95eafe68b7c305abcc8 Mon Sep 17 00:00:00 2001
From: Sofien Scholze <sofien@scholze.dev>
Date: Wed, 24 Sep 2025 22:52:20 +0200
Subject: [PATCH 1/7] fix: docker terminal dropdown not showing containers for
 application of type "docker-compose"

---
 .../dashboard/compose/general/actions.tsx     |  1 +
 .../docker/terminal/docker-terminal.tsx       | 55 +++++++++++++------
 .../web-server/docker-terminal-modal.tsx      | 27 +++++----
 3 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx
index 870444be7..1bbeb880e 100644
--- a/apps/dokploy/components/dashboard/compose/general/actions.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx
@@ -195,6 +195,7 @@ export const ComposeActions = ({ composeId }: Props) => {
 			<DockerTerminalModal
 				appName={data?.appName || ""}
 				serverId={data?.serverId || ""}
+				appType={data?.composeType || "docker-compose"}
 			>
 				<Button
 					variant="outline"
diff --git a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
index ad34d69ce..d150774e7 100644
--- a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
+++ b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
@@ -1,14 +1,15 @@
 import { Terminal } from "@xterm/xterm";
-import React, { useEffect, useRef } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { FitAddon } from "xterm-addon-fit";
 import "@xterm/xterm/css/xterm.css";
 import { AttachAddon } from "@xterm/addon-attach";
 import { useTheme } from "next-themes";
+import { Label } from "@/components/ui/label";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 interface Props {
 	id: string;
-	containerId: string;
+	containerId?: string;
 	serverId?: string;
 }
 
@@ -19,6 +20,7 @@ export const DockerTerminal: React.FC<Props> = ({
 }) => {
 	const termRef = useRef(null);
 	const [activeWay, setActiveWay] = React.useState<string | undefined>("bash");
+	const [isConnected, setIsConnected] = useState(false);
 	const { resolvedTheme } = useTheme();
 	useEffect(() => {
 		const container = document.getElementById(id);
@@ -36,31 +38,48 @@ export const DockerTerminal: React.FC<Props> = ({
 			},
 		});
 		const addonFit = new FitAddon();
-
-		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-
-		const wsUrl = `${protocol}//${window.location.host}/docker-container-terminal?containerId=${containerId}&activeWay=${activeWay}${serverId ? `&serverId=${serverId}` : ""}`;
-
-		const ws = new WebSocket(wsUrl);
-
-		const addonAttach = new AttachAddon(ws);
 		// @ts-ignore
 		term.open(termRef.current);
 		// @ts-ignore
 		term.loadAddon(addonFit);
-		term.loadAddon(addonAttach);
 		addonFit.fit();
-		return () => {
-			ws.readyState === WebSocket.OPEN && ws.close();
-		};
+
+		// only connect if containerId is provided
+		if (
+			containerId &&
+			containerId !== "" &&
+			containerId !== "select-a-container"
+		) {
+			const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+
+			const wsUrl = `${protocol}//${window.location.host}/docker-container-terminal?containerId=${containerId}&activeWay=${activeWay}${serverId ? `&serverId=${serverId}` : ""}`;
+
+			const ws = new WebSocket(wsUrl);
+
+			const addonAttach = new AttachAddon(ws);
+
+			term.loadAddon(addonAttach);
+
+			ws.onopen = () => {
+				setIsConnected(true);
+			};
+
+			ws.onclose = () => {
+				setIsConnected(false);
+			};
+
+			return () => {
+				ws.readyState === WebSocket.OPEN && ws.close();
+			};
+		}
 	}, [containerId, activeWay, id]);
 
 	return (
 		<div className="flex flex-col gap-4">
-			<div className="flex flex-col gap-2">
-				<span>
-					Select way to connect to <b>{containerId}</b>
-				</span>
+			<div className="flex flex-col gap-2  mt-4">
+				<Label>
+					Select shell to connect to <b>{isConnected ? containerId : "..."}</b>
+				</Label>
 				<Tabs value={activeWay} onValueChange={setActiveWay}>
 					<TabsList>
 						<TabsTrigger value="bash">Bash</TabsTrigger>
diff --git a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
index 2fe0c0af3..f3517ed9f 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
@@ -13,7 +13,6 @@ import {
 	DialogTitle,
 	DialogTrigger,
 } from "@/components/ui/dialog";
-import { Label } from "@/components/ui/label";
 import {
 	Select,
 	SelectContent,
@@ -40,23 +39,36 @@ interface Props {
 	appName: string;
 	children?: React.ReactNode;
 	serverId?: string;
+	appType?: "stack" | "docker-compose";
 }
 
-export const DockerTerminalModal = ({ children, appName, serverId }: Props) => {
+export const DockerTerminalModal = ({
+	children,
+	appName,
+	serverId,
+	appType,
+}: Props) => {
 	const { data, isLoading } = api.docker.getContainersByAppNameMatch.useQuery(
 		{
 			appName,
-			serverId,
+			appType,
+			...(serverId ? { serverId } : {}),
 		},
 		{
 			enabled: !!appName,
 		},
 	);
+
+	
 	const [containerId, setContainerId] = useState<string | undefined>();
 	const [mainDialogOpen, setMainDialogOpen] = useState(false);
 	const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
 
 	const handleMainDialogOpenChange = (open: boolean) => {
+		if (!open && !containerId) {
+			setMainDialogOpen(false);
+			return;
+		}
 		if (!open) {
 			setConfirmDialogOpen(true);
 		} else {
@@ -83,7 +95,7 @@ export const DockerTerminalModal = ({ children, appName, serverId }: Props) => {
 		<Dialog open={mainDialogOpen} onOpenChange={handleMainDialogOpenChange}>
 			<DialogTrigger asChild>{children}</DialogTrigger>
 			<DialogContent
-				className="max-h-[85vh]    sm:max-w-7xl"
+				className="max-h-[85vh] sm:max-w-7xl"
 				onEscapeKeyDown={(event) => event.preventDefault()}
 			>
 				<DialogHeader>
@@ -92,7 +104,6 @@ export const DockerTerminalModal = ({ children, appName, serverId }: Props) => {
 						Easy way to access to docker container
 					</DialogDescription>
 				</DialogHeader>
-				<Label>Select a container to view logs</Label>
 				<Select onValueChange={setContainerId} value={containerId}>
 					<SelectTrigger>
 						{isLoading ? (
@@ -121,11 +132,7 @@ export const DockerTerminalModal = ({ children, appName, serverId }: Props) => {
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				<Terminal
-					serverId={serverId || ""}
-					id="terminal"
-					containerId={containerId || "select-a-container"}
-				/>
+				<Terminal serverId={serverId} id="terminal" containerId={containerId} />
 				<Dialog open={confirmDialogOpen} onOpenChange={setConfirmDialogOpen}>
 					<DialogContent onEscapeKeyDown={(event) => event.preventDefault()}>
 						<DialogHeader>

From 598ecb8c6eed36c9a899ae92d028f39b7330c64c Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 06:39:08 +0000
Subject: [PATCH 2/7] [autofix.ci] apply automated fixes

---
 .../dashboard/settings/web-server/docker-terminal-modal.tsx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
index f3517ed9f..dc39575d1 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
@@ -59,7 +59,6 @@ export const DockerTerminalModal = ({
 		},
 	);
 
-	
 	const [containerId, setContainerId] = useState<string | undefined>();
 	const [mainDialogOpen, setMainDialogOpen] = useState(false);
 	const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);

From aadb278e5fa2e0f5903f8df395c3ed79e5dd72fd Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:45:07 -0600
Subject: [PATCH 3/7] refactor: simplify WebSocket connection logic in
 DockerTerminal component

- Removed redundant checks for containerId before establishing WebSocket connection.
- Streamlined the connection setup and added the AttachAddon directly after the terminal is opened.
- Updated UI text to clarify the connection method.
---
 .../docker/terminal/docker-terminal.tsx       | 47 ++++++-------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
index d150774e7..842509bc0 100644
--- a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
+++ b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
@@ -4,7 +4,6 @@ import { FitAddon } from "xterm-addon-fit";
 import "@xterm/xterm/css/xterm.css";
 import { AttachAddon } from "@xterm/addon-attach";
 import { useTheme } from "next-themes";
-import { Label } from "@/components/ui/label";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
 
 interface Props {
@@ -38,48 +37,30 @@ export const DockerTerminal: React.FC<Props> = ({
 			},
 		});
 		const addonFit = new FitAddon();
+		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
+
+		const wsUrl = `${protocol}//${window.location.host}/docker-container-terminal?containerId=${containerId}&activeWay=${activeWay}${serverId ? `&serverId=${serverId}` : ""}`;
+
+		const ws = new WebSocket(wsUrl);
+
+		const addonAttach = new AttachAddon(ws);
 		// @ts-ignore
 		term.open(termRef.current);
 		// @ts-ignore
 		term.loadAddon(addonFit);
+		term.loadAddon(addonAttach);
 		addonFit.fit();
-
-		// only connect if containerId is provided
-		if (
-			containerId &&
-			containerId !== "" &&
-			containerId !== "select-a-container"
-		) {
-			const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
-
-			const wsUrl = `${protocol}//${window.location.host}/docker-container-terminal?containerId=${containerId}&activeWay=${activeWay}${serverId ? `&serverId=${serverId}` : ""}`;
-
-			const ws = new WebSocket(wsUrl);
-
-			const addonAttach = new AttachAddon(ws);
-
-			term.loadAddon(addonAttach);
-
-			ws.onopen = () => {
-				setIsConnected(true);
-			};
-
-			ws.onclose = () => {
-				setIsConnected(false);
-			};
-
-			return () => {
-				ws.readyState === WebSocket.OPEN && ws.close();
-			};
-		}
+		return () => {
+			ws.readyState === WebSocket.OPEN && ws.close();
+		};
 	}, [containerId, activeWay, id]);
 
 	return (
 		<div className="flex flex-col gap-4">
 			<div className="flex flex-col gap-2  mt-4">
-				<Label>
-					Select shell to connect to <b>{isConnected ? containerId : "..."}</b>
-				</Label>
+				<span>
+					Select way to connect to <b>{containerId}</b>
+				</span>
 				<Tabs value={activeWay} onValueChange={setActiveWay}>
 					<TabsList>
 						<TabsTrigger value="bash">Bash</TabsTrigger>

From 8a9a0e49ce7221b6fdcc8b8afcbd12a0a18351cb Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:45:45 -0600
Subject: [PATCH 4/7] refactor: remove unused state in DockerTerminal component

- Eliminated the `isConnected` state variable as it was not being utilized.
- Cleaned up imports by removing unused `useState` hook.
---
 .../components/dashboard/docker/terminal/docker-terminal.tsx   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
index 842509bc0..ab47514f9 100644
--- a/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
+++ b/apps/dokploy/components/dashboard/docker/terminal/docker-terminal.tsx
@@ -1,5 +1,5 @@
 import { Terminal } from "@xterm/xterm";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef } from "react";
 import { FitAddon } from "xterm-addon-fit";
 import "@xterm/xterm/css/xterm.css";
 import { AttachAddon } from "@xterm/addon-attach";
@@ -19,7 +19,6 @@ export const DockerTerminal: React.FC<Props> = ({
 }) => {
 	const termRef = useRef(null);
 	const [activeWay, setActiveWay] = React.useState<string | undefined>("bash");
-	const [isConnected, setIsConnected] = useState(false);
 	const { resolvedTheme } = useTheme();
 	useEffect(() => {
 		const container = document.getElementById(id);

From c8320da71642555b965b7518892e8612e04adedf Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:46:27 -0600
Subject: [PATCH 5/7] refactor: simplify props destructuring in
 DockerTerminalModal component

- Updated the props destructuring to directly include `serverId` instead of using a conditional spread operator.
- Improved code readability by streamlining the object structure.
---
 .../dashboard/settings/web-server/docker-terminal-modal.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
index dc39575d1..5f0721310 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
@@ -52,7 +52,7 @@ export const DockerTerminalModal = ({
 		{
 			appName,
 			appType,
-			...(serverId ? { serverId } : {}),
+			serverId,
 		},
 		{
 			enabled: !!appName,

From 586195b5c868dea6ff34a63716cecbbdd4aafcbe Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:47:50 -0600
Subject: [PATCH 6/7] refactor: enhance DockerTerminalModal component for
 better prop handling

- Removed unnecessary conditional check for containerId in the main dialog open handler.
- Updated Terminal component to ensure serverId and containerId have default values, improving robustness and user experience.
---
 .../settings/web-server/docker-terminal-modal.tsx      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
index 5f0721310..30471bcba 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx
@@ -64,10 +64,6 @@ export const DockerTerminalModal = ({
 	const [confirmDialogOpen, setConfirmDialogOpen] = useState(false);
 
 	const handleMainDialogOpenChange = (open: boolean) => {
-		if (!open && !containerId) {
-			setMainDialogOpen(false);
-			return;
-		}
 		if (!open) {
 			setConfirmDialogOpen(true);
 		} else {
@@ -131,7 +127,11 @@ export const DockerTerminalModal = ({
 						</SelectGroup>
 					</SelectContent>
 				</Select>
-				<Terminal serverId={serverId} id="terminal" containerId={containerId} />
+				<Terminal
+					serverId={serverId || ""}
+					id="terminal"
+					containerId={containerId || "select-a-container"}
+				/>
 				<Dialog open={confirmDialogOpen} onOpenChange={setConfirmDialogOpen}>
 					<DialogContent onEscapeKeyDown={(event) => event.preventDefault()}>
 						<DialogHeader>

From e934d4f4ce9453a8071f5235fcb5393c07480f71 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 5 Oct 2025 00:48:07 -0600
Subject: [PATCH 7/7] refactor: remove unused badgeStateColor variable in
 ShowDockerLogsStack component

- Eliminated the unused badgeStateColor variable to clean up the code.
- Improved overall readability and maintainability of the ShowDockerLogsStack component.
---
 apps/dokploy/components/dashboard/compose/logs/show-stack.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
index 4c004918b..98c6c0470 100644
--- a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
+++ b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx
@@ -37,8 +37,6 @@ interface Props {
 	serverId?: string;
 }
 
-badgeStateColor;
-
 export const ShowDockerLogsStack = ({ appName, serverId }: Props) => {
 	const [option, setOption] = useState<"swarm" | "native">("native");
 	const [containerId, setContainerId] = useState<string | undefined>();