Self-hosted, plugin-based server management.
TypeScript dockerhomelabpluginsrdpremote-desktopself-hostedserver-managementsftpsshterminaltermixvnc
fix: stop connection screens crashing outside the connection log provider
LukeGusa15372a224c9
diff --git a/src/ui/components/connection/ConnectionLogPanel.tsx b/src/ui/components/connection/ConnectionLogPanel.tsxindex 92b0ad81a..0075a8fa7 100644--- a/src/ui/components/connection/ConnectionLogPanel.tsx+++ b/src/ui/components/connection/ConnectionLogPanel.tsx@@ -1,5 +1,5 @@import React, { useEffect, useRef, useState } from "react";-import { useConnectionLog } from "@/ssh/connection-log/ConnectionLogContext.tsx";+import { useOptionalConnectionLog } from "@/ssh/connection-log/ConnectionLogContext.tsx";import { useTranslation } from "react-i18next";import { copyToClipboard } from "@/lib/clipboard.ts";import { Button } from "@/components/button.tsx";@@ -34,20 +34,21 @@ export function ConnectionLogPanel({className,}: ConnectionLogPanelProps) {const { t } = useTranslation();+ const connectionLog = useOptionalConnectionLog();const { logs, clearLogs, isExpanded, toggleExpanded, setIsExpanded } =- useConnectionLog();+ connectionLog ?? {};const lastLogRef = useRef<HTMLDivElement>(null);const [manuallyCollapsed, setManuallyCollapsed] = useState(false);useEffect(() => {- if (hasConnectionError) {+ if (hasConnectionError && setIsExpanded) {setManuallyCollapsed(false);setIsExpanded(true);}}, [hasConnectionError, setIsExpanded]);useEffect(() => {- if (isConnected && !hasConnectionError && !isConnecting) {+ if (isConnected && !hasConnectionError && !isConnecting && clearLogs) {clearLogs();setManuallyCollapsed(false);}@@ -60,7 +61,9 @@ export function ConnectionLogPanel({}, [logs]);const shouldShow =- !isConnected && (isConnecting || hasConnectionError || logs.length > 0);+ !!connectionLog &&+ !isConnected &&+ (isConnecting || hasConnectionError || logs.length > 0);if (!shouldShow) {return null;diff --git a/src/ui/ssh/connection-log/ConnectionLogContext.tsx b/src/ui/ssh/connection-log/ConnectionLogContext.tsxindex cf7a7e414..53da355f4 100644--- a/src/ui/ssh/connection-log/ConnectionLogContext.tsx+++ b/src/ui/ssh/connection-log/ConnectionLogContext.tsx@@ -88,3 +88,9 @@ export function useConnectionLog() {}return context;}++// Loading and error screens render outside any provider, so they get undefined+// instead of a crash.+export function useOptionalConnectionLog() {+ return useContext(ConnectionLogContext);+}diff --git a/src/ui/tests/components/connection/ConnectionScreen.test.tsx b/src/ui/tests/components/connection/ConnectionScreen.test.tsxnew file mode 100644index 000000000..feb59e01e--- /dev/null+++ b/src/ui/tests/components/connection/ConnectionScreen.test.tsx@@ -0,0 +1,46 @@+import { describe, it, expect, vi, afterEach } from "vitest";+import { render, screen, cleanup } from "@testing-library/react";++vi.mock("react-i18next", () => ({+ useTranslation: () => ({ t: (key: string) => key }),+}));++import { ConnectionScreen } from "../../../components/connection/ConnectionScreen";+import { ConnectionLogProvider } from "../../../ssh/connection-log/ConnectionLogContext";++afterEach(cleanup);++describe("ConnectionScreen", () => {+ // Loading and host-not-found screens render before the provider is mounted,+ // which used to throw and take down the whole RDP/VNC/Telnet tab.+ it("renders without a ConnectionLogProvider", () => {+ expect(() =>+ render(<ConnectionScreen status="connecting" message="common.loading" />),+ ).not.toThrow();++ expect(screen.getByText("common.loading")).toBeTruthy();+ });++ it("renders the disconnected state without a provider", () => {+ expect(() =>+ render(+ <ConnectionScreen+ status="disconnected"+ message="guacamole.hostNotFound"+ />,+ ),+ ).not.toThrow();++ expect(screen.getByText("guacamole.hostNotFound")).toBeTruthy();+ });++ it("still shows the connection log when a provider is present", () => {+ render(+ <ConnectionLogProvider>+ <ConnectionScreen status="connecting" message="common.loading" />+ </ConnectionLogProvider>,+ );++ expect(screen.getByText(/terminal\.connectionLogTitle/)).toBeTruthy();+ });+});