Merge pull request #989 from Dokploy/refactor/add-no-trunc

Refactor/add no trunc

apps/dokploy/components/dashboard/docker/logs/show-docker-modal-stack-logs.tsx

@@ -0,0 +1,58 @@
+import {
+	Dialog,
+	DialogContent,
+	DialogDescription,
+	DialogHeader,
+	DialogTitle,
+	DialogTrigger,
+} from "@/components/ui/dialog";
+import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
+import dynamic from "next/dynamic";
+import type React from "react";
+export const DockerLogsId = dynamic(
+	() =>
+		import("@/components/dashboard/docker/logs/docker-logs-id").then(
+			(e) => e.DockerLogsId,
+		),
+	{
+		ssr: false,
+	},
+);
+
+interface Props {
+	containerId: string;
+	children?: React.ReactNode;
+	serverId?: string | null;
+}
+
+export const ShowDockerModalStackLogs = ({
+	containerId,
+	children,
+	serverId,
+}: Props) => {
+	return (
+		<Dialog>
+			<DialogTrigger asChild>
+				<DropdownMenuItem
+					className="w-full cursor-pointer space-x-3"
+					onSelect={(e) => e.preventDefault()}
+				>
+					{children}
+				</DropdownMenuItem>
+			</DialogTrigger>
+			<DialogContent className="max-h-screen  overflow-y-auto sm:max-w-7xl">
+				<DialogHeader>
+					<DialogTitle>View Logs</DialogTitle>
+					<DialogDescription>View the logs for {containerId}</DialogDescription>
+				</DialogHeader>
+				<div className="flex flex-col gap-4 pt-2.5">
+					<DockerLogsId
+						containerId={containerId || ""}
+						serverId={serverId}
+						runType="swarm"
+					/>
+				</div>
+			</DialogContent>
+		</Dialog>
+	);
+};

apps/dokploy/components/dashboard/swarm/applications/columns.tsx

@@ -11,11 +11,7 @@ import {
 } from "@/components/ui/dropdown-menu";
 
 import { Badge } from "@/components/ui/badge";
-import { ShowNodeConfig } from "../details/show-node-config";
+import { ShowDockerModalStackLogs } from "../../docker/logs/show-docker-modal-stack-logs";
-// import { ShowContainerConfig } from "../config/show-container-config";
-// import { ShowDockerModalLogs } from "../logs/show-docker-modal-logs";
-// import { DockerTerminalModal } from "../terminal/docker-terminal-modal";
-// import type { Container } from "./show-containers";
 
 export interface ApplicationList {
 	ID: string;
@@ -28,6 +24,7 @@ export interface ApplicationList {
 	DesiredState: string;
 	Error: string;
 	Node: string;
+	serverId: string;
 }
 
 export const columns: ColumnDef<ApplicationList>[] = [
@@ -212,7 +209,37 @@ export const columns: ColumnDef<ApplicationList>[] = [
 			);
 		},
 		cell: ({ row }) => {
-			return <div>{row.getValue("Errors")}</div>;
+			return <div className="w-[10rem]">{row.getValue("Errors")}</div>;
+		},
+	},
+	{
+		accessorKey: "Logs",
+		accessorFn: (row) => row.Error,
+		header: ({ column }) => {
+			return <span>Logs</span>;
+		},
+		cell: ({ row }) => {
+			return (
+				<span className="w-[10rem]">
+					<DropdownMenu>
+						<DropdownMenuTrigger asChild>
+							<Button variant="ghost" className="h-8 w-8 p-0">
+								<span className="sr-only">Open menu</span>
+								<MoreHorizontal className="h-4 w-4" />
+							</Button>
+						</DropdownMenuTrigger>
+						<DropdownMenuContent align="end">
+							<DropdownMenuLabel>Actions</DropdownMenuLabel>
+							<ShowDockerModalStackLogs
+								containerId={row.original.ID}
+								serverId={row.original.serverId}
+							>
+								View Logs
+							</ShowDockerModalStackLogs>
+						</DropdownMenuContent>
+					</DropdownMenu>
+				</span>
+			);
 		},
 	},
 ];

apps/dokploy/components/dashboard/swarm/applications/show-applications.tsx

@@ -89,6 +89,7 @@ export const ShowNodeApplications = ({ serverId }: Props) => {
 			Error: detail.Error,
 			Node: detail.Node,
 			Ports: detail.Ports || app.Ports,
+			serverId: serverId || "",
 		}));
 	});
 

packages/server/src/services/docker.ts

@@ -425,7 +425,8 @@ export const getNodeApplications = async (serverId?: string) => {
 		const appArray = stdout
 			.trim()
 			.split("\n")
-			.map((line) => JSON.parse(line));
+			.map((line) => JSON.parse(line))
+			.filter((service) => !service.Name.startsWith('dokploy-'));
 
 		return appArray;
 	} catch (error) {}
@@ -438,7 +439,7 @@ export const getApplicationInfo = async (
 	try {
 		let stdout = "";
 		let stderr = "";
-		const command = `docker service ps ${appName} --format '{{json .}}'`;
+		const command = `docker service ps ${appName} --format '{{json .}}' --no-trunc`;
 
 		if (serverId) {
 			const result = await execAsyncRemote(serverId, command);