mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
feat: add loading spinner when logs are being loaded
This commit is contained in:
190km
@@ -1,275 +1,286 @@
|
|||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
import {
|
import {
|
||||||
Select,
|
Select,
|
||||||
SelectContent,
|
SelectContent,
|
||||||
SelectItem,
|
SelectItem,
|
||||||
SelectTrigger,
|
SelectTrigger,
|
||||||
SelectValue,
|
SelectValue,
|
||||||
} from "@/components/ui/select";
|
} from "@/components/ui/select";
|
||||||
import { api } from "@/utils/api";
|
import { api } from "@/utils/api";
|
||||||
import { Download as DownloadIcon } from "lucide-react";
|
import { Download as DownloadIcon, Loader2 } from "lucide-react";
|
||||||
import React, { useEffect, useRef } from "react";
|
import React, { useEffect, useRef } from "react";
|
||||||
import { TerminalLine } from "./terminal-line";
|
import { TerminalLine } from "./terminal-line";
|
||||||
import { type LogLine, getLogType, parseLogs } from "./utils";
|
import { type LogLine, getLogType, parseLogs } from "./utils";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
containerId: string;
|
containerId: string;
|
||||||
serverId?: string | null;
|
serverId?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
type TimeFilter = "all" | "1h" | "6h" | "24h" | "168h" | "720h";
|
type TimeFilter = "all" | "1h" | "6h" | "24h" | "168h" | "720h";
|
||||||
type TypeFilter = "all" | "error" | "warning" | "success" | "info";
|
type TypeFilter = "all" | "error" | "warning" | "success" | "info";
|
||||||
|
|
||||||
export const DockerLogsId: React.FC<Props> = ({ containerId, serverId }) => {
|
export const DockerLogsId: React.FC<Props> = ({ containerId, serverId }) => {
|
||||||
const { data } = api.docker.getConfig.useQuery(
|
const { data } = api.docker.getConfig.useQuery(
|
||||||
{
|
{
|
||||||
containerId,
|
containerId,
|
||||||
serverId: serverId ?? undefined,
|
serverId: serverId ?? undefined,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
enabled: !!containerId,
|
enabled: !!containerId,
|
||||||
},
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
const [rawLogs, setRawLogs] = React.useState("");
|
const [rawLogs, setRawLogs] = React.useState("");
|
||||||
const [filteredLogs, setFilteredLogs] = React.useState<LogLine[]>([]);
|
const [filteredLogs, setFilteredLogs] = React.useState<LogLine[]>([]);
|
||||||
const [autoScroll, setAutoScroll] = React.useState(true);
|
const [autoScroll, setAutoScroll] = React.useState(true);
|
||||||
const [lines, setLines] = React.useState<number>(100);
|
const [lines, setLines] = React.useState<number>(100);
|
||||||
const [search, setSearch] = React.useState<string>("");
|
const [search, setSearch] = React.useState<string>("");
|
||||||
const [since, setSince] = React.useState<TimeFilter>("all");
|
const [since, setSince] = React.useState<TimeFilter>("all");
|
||||||
const [typeFilter, setTypeFilter] = React.useState<TypeFilter>("all");
|
const [typeFilter, setTypeFilter] = React.useState<TypeFilter>("all");
|
||||||
const scrollRef = useRef<HTMLDivElement>(null);
|
const scrollRef = useRef<HTMLDivElement>(null);
|
||||||
|
const [isLoading, setIsLoading] = React.useState(false);
|
||||||
const scrollToBottom = () => {
|
|
||||||
if (autoScroll && scrollRef.current) {
|
const scrollToBottom = () => {
|
||||||
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
if (autoScroll && scrollRef.current) {
|
||||||
}
|
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
||||||
};
|
}
|
||||||
|
};
|
||||||
const handleScroll = () => {
|
|
||||||
if (!scrollRef.current) return;
|
const handleScroll = () => {
|
||||||
|
if (!scrollRef.current) return;
|
||||||
const { scrollTop, scrollHeight, clientHeight } = scrollRef.current;
|
|
||||||
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) < 10;
|
const { scrollTop, scrollHeight, clientHeight } = scrollRef.current;
|
||||||
setAutoScroll(isAtBottom);
|
const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) < 10;
|
||||||
};
|
setAutoScroll(isAtBottom);
|
||||||
|
};
|
||||||
const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setRawLogs("");
|
const handleSearch = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setFilteredLogs([]);
|
setRawLogs("");
|
||||||
setSearch(e.target.value || "");
|
setFilteredLogs([]);
|
||||||
};
|
setSearch(e.target.value || "");
|
||||||
|
};
|
||||||
const handleLines = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
||||||
setRawLogs("");
|
const handleLines = (e: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
setFilteredLogs([]);
|
setRawLogs("");
|
||||||
setLines(Number(e.target.value) || 1);
|
setFilteredLogs([]);
|
||||||
};
|
setLines(Number(e.target.value) || 1);
|
||||||
|
};
|
||||||
const handleSince = (value: TimeFilter) => {
|
|
||||||
setRawLogs("");
|
const handleSince = (value: TimeFilter) => {
|
||||||
setFilteredLogs([]);
|
setRawLogs("");
|
||||||
setSince(value);
|
setFilteredLogs([]);
|
||||||
};
|
setSince(value);
|
||||||
|
};
|
||||||
const handleTypeFilter = (value: TypeFilter) => {
|
|
||||||
setTypeFilter(value);
|
const handleTypeFilter = (value: TypeFilter) => {
|
||||||
};
|
setTypeFilter(value);
|
||||||
|
};
|
||||||
useEffect(() => {
|
|
||||||
setRawLogs("");
|
useEffect(() => {
|
||||||
setFilteredLogs([]);
|
setRawLogs("");
|
||||||
}, [containerId]);
|
setFilteredLogs([]);
|
||||||
|
}, [containerId]);
|
||||||
useEffect(() => {
|
|
||||||
if (!containerId) return;
|
useEffect(() => {
|
||||||
|
if (!containerId) return;
|
||||||
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
setIsLoading(true);
|
||||||
const params = new globalThis.URLSearchParams({
|
|
||||||
containerId,
|
const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
|
||||||
tail: lines.toString(),
|
const params = new globalThis.URLSearchParams({
|
||||||
since,
|
containerId,
|
||||||
search,
|
tail: lines.toString(),
|
||||||
});
|
since,
|
||||||
|
search,
|
||||||
if (serverId) {
|
});
|
||||||
params.append("serverId", serverId);
|
|
||||||
}
|
if (serverId) {
|
||||||
|
params.append("serverId", serverId);
|
||||||
const wsUrl = `${protocol}//${
|
}
|
||||||
window.location.host
|
|
||||||
}/docker-container-logs?${params.toString()}`;
|
const wsUrl = `${protocol}//${
|
||||||
console.log("Connecting to WebSocket:", wsUrl);
|
window.location.host
|
||||||
const ws = new WebSocket(wsUrl);
|
}/docker-container-logs?${params.toString()}`;
|
||||||
|
console.log("Connecting to WebSocket:", wsUrl);
|
||||||
ws.onopen = () => {
|
const ws = new WebSocket(wsUrl);
|
||||||
console.log("WebSocket connected");
|
|
||||||
};
|
ws.onopen = () => {
|
||||||
|
console.log("WebSocket connected");
|
||||||
ws.onmessage = (e) => {
|
setIsLoading(false)
|
||||||
// console.log("Received message:", e.data);
|
};
|
||||||
setRawLogs((prev) => prev + e.data);
|
|
||||||
};
|
ws.onmessage = (e) => {
|
||||||
|
setRawLogs((prev) => prev + e.data);
|
||||||
ws.onerror = (error) => {
|
setIsLoading(false);
|
||||||
console.error("WebSocket error:", error);
|
};
|
||||||
};
|
|
||||||
|
ws.onerror = (error) => {
|
||||||
ws.onclose = (e) => {
|
console.error("WebSocket error:", error);
|
||||||
console.log("WebSocket closed:", e.reason);
|
setIsLoading(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
return () => {
|
ws.onclose = (e) => {
|
||||||
if (ws.readyState === WebSocket.OPEN) {
|
console.log("WebSocket closed:", e.reason);
|
||||||
ws.close();
|
setIsLoading(false);
|
||||||
}
|
};
|
||||||
};
|
|
||||||
}, [containerId, serverId, lines, search, since]);
|
return () => {
|
||||||
|
if (ws.readyState === WebSocket.OPEN) {
|
||||||
const handleDownload = () => {
|
ws.close();
|
||||||
const logContent = filteredLogs
|
}
|
||||||
.map(
|
};
|
||||||
({ timestamp, message }: { timestamp: Date | null; message: string }) =>
|
}, [containerId, serverId, lines, search, since]);
|
||||||
`${timestamp?.toISOString() || "No timestamp"} ${message}`,
|
|
||||||
)
|
const handleDownload = () => {
|
||||||
.join("\n");
|
const logContent = filteredLogs
|
||||||
|
.map(
|
||||||
const blob = new Blob([logContent], { type: "text/plain" });
|
({ timestamp, message }: { timestamp: Date | null; message: string }) =>
|
||||||
const url = URL.createObjectURL(blob);
|
`${timestamp?.toISOString() || "No timestamp"} ${message}`
|
||||||
const a = document.createElement("a");
|
)
|
||||||
const appName = data.Name.replace("/", "") || "app";
|
.join("\n");
|
||||||
const isoDate = new Date().toISOString();
|
|
||||||
a.href = url;
|
const blob = new Blob([logContent], { type: "text/plain" });
|
||||||
a.download = `${appName}-${isoDate.slice(0, 10).replace(/-/g, "")}_${isoDate.slice(11, 19).replace(/:/g, "")}.log.txt`;
|
const url = URL.createObjectURL(blob);
|
||||||
document.body.appendChild(a);
|
const a = document.createElement("a");
|
||||||
a.click();
|
const appName = data.Name.replace("/", "") || "app";
|
||||||
document.body.removeChild(a);
|
const isoDate = new Date().toISOString();
|
||||||
URL.revokeObjectURL(url);
|
a.href = url;
|
||||||
};
|
a.download = `${appName}-${isoDate.slice(0, 10).replace(/-/g, "")}_${isoDate
|
||||||
|
.slice(11, 19)
|
||||||
const handleFilter = (logs: LogLine[]) => {
|
.replace(/:/g, "")}.log.txt`;
|
||||||
return logs.filter((log) => {
|
document.body.appendChild(a);
|
||||||
const logType = getLogType(log.message).type;
|
a.click();
|
||||||
|
document.body.removeChild(a);
|
||||||
const matchesType = typeFilter === "all" || logType === typeFilter;
|
URL.revokeObjectURL(url);
|
||||||
|
};
|
||||||
return matchesType;
|
|
||||||
});
|
const handleFilter = (logs: LogLine[]) => {
|
||||||
};
|
return logs.filter((log) => {
|
||||||
|
const logType = getLogType(log.message).type;
|
||||||
useEffect(() => {
|
|
||||||
setRawLogs("");
|
const matchesType = typeFilter === "all" || logType === typeFilter;
|
||||||
setFilteredLogs([]);
|
|
||||||
}, [containerId]);
|
return matchesType;
|
||||||
|
});
|
||||||
useEffect(() => {
|
};
|
||||||
const logs = parseLogs(rawLogs);
|
|
||||||
const filtered = handleFilter(logs);
|
useEffect(() => {
|
||||||
setFilteredLogs(filtered);
|
setRawLogs("");
|
||||||
}, [rawLogs, search, lines, since, typeFilter]);
|
setFilteredLogs([]);
|
||||||
|
}, [containerId]);
|
||||||
useEffect(() => {
|
|
||||||
scrollToBottom();
|
useEffect(() => {
|
||||||
|
const logs = parseLogs(rawLogs);
|
||||||
if (autoScroll && scrollRef.current) {
|
const filtered = handleFilter(logs);
|
||||||
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
setFilteredLogs(filtered);
|
||||||
}
|
}, [rawLogs, search, lines, since, typeFilter]);
|
||||||
}, [filteredLogs, autoScroll]);
|
|
||||||
|
useEffect(() => {
|
||||||
return (
|
scrollToBottom();
|
||||||
<div className="flex flex-col gap-4">
|
|
||||||
<div className="shadow-md rounded-lg overflow-hidden">
|
if (autoScroll && scrollRef.current) {
|
||||||
<div className="space-y-4">
|
scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
|
||||||
<div className="flex flex-wrap justify-between items-start sm:items-center gap-4">
|
}
|
||||||
<div className="flex flex-wrap gap-4">
|
}, [filteredLogs, autoScroll]);
|
||||||
<Input
|
|
||||||
type="text"
|
return (
|
||||||
placeholder="Number of lines to show"
|
<div className="flex flex-col gap-4">
|
||||||
value={lines}
|
<div className="shadow-md rounded-lg overflow-hidden">
|
||||||
onChange={handleLines}
|
<div className="space-y-4">
|
||||||
className="inline-flex h-9 text-sm text-white placeholder-gray-400 w-full sm:w-auto"
|
<div className="flex flex-wrap justify-between items-start sm:items-center gap-4">
|
||||||
/>
|
<div className="flex flex-wrap gap-4">
|
||||||
|
<Input
|
||||||
<Select value={since} onValueChange={handleSince}>
|
type="text"
|
||||||
<SelectTrigger className="w-[180px] h-9">
|
placeholder="Number of lines to show"
|
||||||
<SelectValue placeholder="Time filter" />
|
value={lines}
|
||||||
</SelectTrigger>
|
onChange={handleLines}
|
||||||
<SelectContent>
|
className="inline-flex h-9 text-sm text-white placeholder-gray-400 w-full sm:w-auto"
|
||||||
<SelectItem value="1h">Last hour</SelectItem>
|
/>
|
||||||
<SelectItem value="6h">Last 6 hours</SelectItem>
|
|
||||||
<SelectItem value="24h">Last 24 hours</SelectItem>
|
<Select value={since} onValueChange={handleSince}>
|
||||||
<SelectItem value="168h">Last 7 days</SelectItem>
|
<SelectTrigger className="w-[180px] h-9">
|
||||||
<SelectItem value="720h">Last 30 days</SelectItem>
|
<SelectValue placeholder="Time filter" />
|
||||||
<SelectItem value="all">All time</SelectItem>
|
</SelectTrigger>
|
||||||
</SelectContent>
|
<SelectContent>
|
||||||
</Select>
|
<SelectItem value="1h">Last hour</SelectItem>
|
||||||
|
<SelectItem value="6h">Last 6 hours</SelectItem>
|
||||||
<Select value={typeFilter} onValueChange={handleTypeFilter}>
|
<SelectItem value="24h">Last 24 hours</SelectItem>
|
||||||
<SelectTrigger className="w-[180px] h-9">
|
<SelectItem value="168h">Last 7 days</SelectItem>
|
||||||
<SelectValue placeholder="Type filter" />
|
<SelectItem value="720h">Last 30 days</SelectItem>
|
||||||
</SelectTrigger>
|
<SelectItem value="all">All time</SelectItem>
|
||||||
<SelectContent>
|
</SelectContent>
|
||||||
<SelectItem value="all">
|
</Select>
|
||||||
<Badge variant="blank">All</Badge>
|
|
||||||
</SelectItem>
|
<Select value={typeFilter} onValueChange={handleTypeFilter}>
|
||||||
<SelectItem value="error">
|
<SelectTrigger className="w-[180px] h-9">
|
||||||
<Badge variant="red">Error</Badge>
|
<SelectValue placeholder="Type filter" />
|
||||||
</SelectItem>
|
</SelectTrigger>
|
||||||
<SelectItem value="warning">
|
<SelectContent>
|
||||||
<Badge variant="yellow">Warning</Badge>
|
<SelectItem value="all">
|
||||||
</SelectItem>
|
<Badge variant="blank">All</Badge>
|
||||||
<SelectItem value="success">
|
</SelectItem>
|
||||||
<Badge variant="green">Success</Badge>
|
<SelectItem value="error">
|
||||||
</SelectItem>
|
<Badge variant="red">Error</Badge>
|
||||||
<SelectItem value="info">
|
</SelectItem>
|
||||||
<Badge variant="blue">Info</Badge>
|
<SelectItem value="warning">
|
||||||
</SelectItem>
|
<Badge variant="yellow">Warning</Badge>
|
||||||
</SelectContent>
|
</SelectItem>
|
||||||
</Select>
|
<SelectItem value="success">
|
||||||
|
<Badge variant="green">Success</Badge>
|
||||||
<Input
|
</SelectItem>
|
||||||
type="search"
|
<SelectItem value="info">
|
||||||
placeholder="Search logs..."
|
<Badge variant="blue">Info</Badge>
|
||||||
value={search}
|
</SelectItem>
|
||||||
onChange={handleSearch}
|
</SelectContent>
|
||||||
className="inline-flex h-9 text-sm text-white placeholder-gray-400 w-full sm:w-auto"
|
</Select>
|
||||||
/>
|
|
||||||
</div>
|
<Input
|
||||||
|
type="search"
|
||||||
<Button
|
placeholder="Search logs..."
|
||||||
variant="outline"
|
value={search}
|
||||||
size="sm"
|
onChange={handleSearch}
|
||||||
className="h-9"
|
className="inline-flex h-9 text-sm text-white placeholder-gray-400 w-full sm:w-auto"
|
||||||
onClick={handleDownload}
|
/>
|
||||||
disabled={filteredLogs.length === 0 || !data?.Name}
|
</div>
|
||||||
>
|
|
||||||
<DownloadIcon className="mr-2 h-4 w-4" />
|
<Button
|
||||||
Download logs
|
variant="outline"
|
||||||
</Button>
|
size="sm"
|
||||||
</div>
|
className="h-9"
|
||||||
<div
|
onClick={handleDownload}
|
||||||
ref={scrollRef}
|
disabled={filteredLogs.length === 0 || !data?.Name}
|
||||||
onScroll={handleScroll}
|
>
|
||||||
className="h-[720px] overflow-y-auto space-y-0 border p-4 bg-[#d4d4d4] dark:bg-[#050506] rounded custom-logs-scrollbar"
|
<DownloadIcon className="mr-2 h-4 w-4" />
|
||||||
>
|
Download logs
|
||||||
{filteredLogs.length > 0 ? (
|
</Button>
|
||||||
filteredLogs.map((filteredLog: LogLine, index: number) => (
|
</div>
|
||||||
<TerminalLine
|
<div
|
||||||
key={index}
|
ref={scrollRef}
|
||||||
log={filteredLog}
|
onScroll={handleScroll}
|
||||||
searchTerm={search}
|
className="h-[720px] overflow-y-auto space-y-0 border p-4 bg-[#d4d4d4] dark:bg-[#050506] rounded custom-logs-scrollbar"
|
||||||
/>
|
>
|
||||||
))
|
{filteredLogs.length > 0 ? (
|
||||||
) : (
|
filteredLogs.map((filteredLog: LogLine, index: number) => (
|
||||||
<div className="flex justify-center items-center h-full text-muted-foreground">
|
<TerminalLine
|
||||||
No logs found
|
key={index}
|
||||||
</div>
|
log={filteredLog}
|
||||||
)}
|
searchTerm={search}
|
||||||
</div>
|
/>
|
||||||
</div>
|
))
|
||||||
</div>
|
) : isLoading ? (
|
||||||
</div>
|
<div className="flex justify-center items-center h-full text-muted-foreground">
|
||||||
);
|
<Loader2 className="h-6 w-6 animate-spin" />
|
||||||
};
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex justify-center items-center h-full text-muted-foreground">
|
||||||
|
No logs found
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user