Preserve the sticky-bottom follow invariant across streamed Dev Server and System Controls output. - Track pinned-bottom state synchronously for rebuild and system-log streams. - Follow in-place Dev Server transcript mutations only while the reader is pinned. - Cover manual unsnapping, stream growth, and re-pinning behavior. - Add a patch changeset for live-log scrolling. Files changed: .changeset/fn-8346-live-tail-scroll-follow.md | 7 ++ .../app/components/DevServerLogViewer.tsx | 43 ++++++++++-- .../__tests__/DevServerLogViewer.test.tsx | 47 +++++++++++++ .../__tests__/SystemControlsArea.test.tsx | 81 +++++++++++++++++++++- .../command-center/areas/SystemControlsArea.tsx | 44 ++++++++++-- 5 files changed, 208 insertions(+), 14 deletions(-) Fusion-Task-Id: FN-8346 Fusion-Task-Lineage: c1eeb84d-c0af-473b-99f1-0d8564ac8a24 Co-authored-by: Fusion (runfusion.ai) <noreply@runfusion.ai>
349 lines
12 KiB
TypeScript
349 lines
12 KiB
TypeScript
import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
|
|
import { useTranslation } from "react-i18next";
|
|
import { ChevronDown, Loader2, Maximize2, Minimize2, Search } from "lucide-react";
|
|
import "./DevServerLogViewer.css";
|
|
import type { DevServerLogEntry } from "../hooks/useDevServerLogs";
|
|
import { linkifyReactChildren } from "../utils/filePathLinkify";
|
|
|
|
interface DevServerLogViewerProps {
|
|
entries: DevServerLogEntry[];
|
|
loading: boolean;
|
|
loadingMore: boolean;
|
|
hasMore: boolean;
|
|
total: number | null;
|
|
onLoadMore: () => void;
|
|
/** Whether the dev server is currently running (affects auto-scroll behavior) */
|
|
isRunning: boolean;
|
|
}
|
|
|
|
type LogSeverity = "info" | "warn" | "error";
|
|
type LogSeverityFilter = "all" | LogSeverity;
|
|
|
|
// eslint-disable-next-line no-control-regex -- ANSI escape stripping is required for readable terminal logs.
|
|
const ANSI_ESCAPE_PATTERN = /\x1b\[[0-9;]*m/g;
|
|
const BOTTOM_FOLLOW_THRESHOLD_PX = 50;
|
|
|
|
function isNearBottom(container: HTMLElement): boolean {
|
|
return container.scrollHeight - (container.scrollTop + container.clientHeight) <= BOTTOM_FOLLOW_THRESHOLD_PX;
|
|
}
|
|
|
|
function stripAnsi(value: string): string {
|
|
return value.replace(ANSI_ESCAPE_PATTERN, "");
|
|
}
|
|
|
|
function formatTime(value: string): string {
|
|
if (!value) {
|
|
return "";
|
|
}
|
|
|
|
const parsed = new Date(value);
|
|
if (Number.isNaN(parsed.getTime())) {
|
|
return "";
|
|
}
|
|
|
|
return parsed.toLocaleTimeString([], {
|
|
hour: "2-digit",
|
|
minute: "2-digit",
|
|
second: "2-digit",
|
|
hour12: false,
|
|
});
|
|
}
|
|
|
|
function escapeRegExp(value: string): string {
|
|
return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
|
|
}
|
|
|
|
function getEntrySeverity(entry: DevServerLogEntry): LogSeverity {
|
|
if (entry.stream === "stderr") {
|
|
return "error";
|
|
}
|
|
|
|
const normalizedText = stripAnsi(entry.text).toLowerCase();
|
|
if (/\b(warn|warning)\b/.test(normalizedText)) {
|
|
return "warn";
|
|
}
|
|
|
|
if (/\b(error|fatal)\b/.test(normalizedText)) {
|
|
return "error";
|
|
}
|
|
|
|
return "info";
|
|
}
|
|
|
|
function highlightText(value: string, search: string): ReactNode {
|
|
if (!search) {
|
|
return value;
|
|
}
|
|
|
|
const matcher = new RegExp(`(${escapeRegExp(search)})`, "ig");
|
|
const parts = value.split(matcher);
|
|
const normalizedSearch = search.toLowerCase();
|
|
|
|
return (
|
|
<>
|
|
{parts.map((part, index) => (
|
|
part.toLowerCase() === normalizedSearch
|
|
? <mark key={`${part}-${index}`}>{part}</mark>
|
|
: <span key={`${part}-${index}`}>{part}</span>
|
|
))}
|
|
</>
|
|
);
|
|
}
|
|
|
|
export function DevServerLogViewer({
|
|
entries,
|
|
loading,
|
|
loadingMore,
|
|
hasMore,
|
|
total,
|
|
onLoadMore,
|
|
isRunning,
|
|
}: DevServerLogViewerProps) {
|
|
const { t } = useTranslation("app");
|
|
const containerRef = useRef<HTMLDivElement | null>(null);
|
|
const prevEntryCountRef = useRef(entries.length);
|
|
const prevRunningRef = useRef(isRunning);
|
|
const [isFullscreen, setIsFullscreen] = useState(false);
|
|
const [isUserScrolling, setIsUserScrolling] = useState(false);
|
|
const isUserScrollingRef = useRef(false);
|
|
const [searchQuery, setSearchQuery] = useState("");
|
|
const [severityFilter, setSeverityFilter] = useState<LogSeverityFilter>("all");
|
|
|
|
const filteredBySeverity = useMemo(() => {
|
|
if (severityFilter === "all") {
|
|
return entries;
|
|
}
|
|
|
|
return entries.filter((entry) => getEntrySeverity(entry) === severityFilter);
|
|
}, [entries, severityFilter]);
|
|
|
|
const filteredEntries = useMemo(() => {
|
|
const normalizedSearch = searchQuery.trim().toLowerCase();
|
|
if (!normalizedSearch) {
|
|
return filteredBySeverity;
|
|
}
|
|
|
|
return filteredBySeverity.filter((entry) => stripAnsi(entry.text).toLowerCase().includes(normalizedSearch));
|
|
}, [filteredBySeverity, searchQuery]);
|
|
|
|
const matchCount = filteredEntries.length;
|
|
|
|
const setManualScrollState = useCallback((isManualScrolling: boolean) => {
|
|
isUserScrollingRef.current = isManualScrolling;
|
|
setIsUserScrolling(isManualScrolling);
|
|
}, []);
|
|
|
|
const scrollToBottom = useCallback(() => {
|
|
const container = containerRef.current;
|
|
if (!container) {
|
|
return;
|
|
}
|
|
|
|
container.scrollTop = container.scrollHeight;
|
|
setManualScrollState(false);
|
|
}, [setManualScrollState]);
|
|
|
|
useEffect(() => {
|
|
const previousRunning = prevRunningRef.current;
|
|
const previousEntries = prevEntryCountRef.current;
|
|
const hasNewEntries = entries.length > previousEntries;
|
|
|
|
if (isRunning && (!previousRunning || (!isUserScrolling && hasNewEntries))) {
|
|
scrollToBottom();
|
|
}
|
|
|
|
prevRunningRef.current = isRunning;
|
|
prevEntryCountRef.current = entries.length;
|
|
}, [entries.length, isRunning, isUserScrolling, scrollToBottom]);
|
|
|
|
const handleScroll = useCallback(() => {
|
|
const container = containerRef.current;
|
|
if (!container) {
|
|
return;
|
|
}
|
|
|
|
setManualScrollState(!isNearBottom(container));
|
|
}, [setManualScrollState]);
|
|
|
|
useEffect(() => {
|
|
if (loading || entries.length === 0) {
|
|
return;
|
|
}
|
|
|
|
// Keep current behavior consistent when filtering or loading more while at bottom.
|
|
if (!isUserScrolling && isRunning) {
|
|
scrollToBottom();
|
|
}
|
|
}, [entries, isRunning, isUserScrolling, loading, scrollToBottom]);
|
|
|
|
/*
|
|
FNXC:DevServer 2026-07-18-16:16:
|
|
FN-8346 extends FN-8339's pinned-bottom invariant to in-place dev-server
|
|
transcript growth. MutationObserver watches the growing log content rather
|
|
than the fixed viewport; its synchronous ref guard preserves a manual
|
|
scroll-up even when streamed text changes without increasing entry count.
|
|
*/
|
|
useEffect(() => {
|
|
const container = containerRef.current;
|
|
if (!container || !isRunning || typeof MutationObserver === "undefined") {
|
|
return;
|
|
}
|
|
|
|
const observer = new MutationObserver(() => {
|
|
if (!isUserScrollingRef.current) {
|
|
scrollToBottom();
|
|
}
|
|
});
|
|
observer.observe(container, { childList: true, characterData: true, subtree: true });
|
|
return () => observer.disconnect();
|
|
}, [isRunning, scrollToBottom]);
|
|
|
|
if (loading && entries.length === 0) {
|
|
return (
|
|
<section className="devserver-log-viewer" data-testid="devserver-log-viewer">
|
|
<div className="devserver-log-viewer__loading" data-testid="devserver-log-loading">
|
|
<Loader2 size={16} className="devserver-log-viewer__spinner" />
|
|
<span>{t("devserver.loadingLogs", "Loading logs…")}</span>
|
|
</div>
|
|
</section>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<section
|
|
className={`devserver-log-viewer${isFullscreen ? " devserver-log-viewer--fullscreen" : ""}`}
|
|
data-testid="devserver-log-viewer"
|
|
>
|
|
<header className="devserver-log-viewer__toolbar">
|
|
<div className="devserver-log-viewer__toolbar-meta">
|
|
<span className="devserver-log-viewer__title">{t("devserver.logs", "Logs")}</span>
|
|
<span className="devserver-log-viewer__count" data-testid="devserver-log-count">
|
|
{total !== null ? `${entries.length}/${total}` : `${entries.length}`} {t("devserver.lines", "lines")}
|
|
</span>
|
|
</div>
|
|
|
|
<div className="devserver-log-viewer__toolbar-actions">
|
|
<label className="devserver-log-viewer__severity" htmlFor="devserver-log-severity-filter">
|
|
<span className="visually-hidden">{t("devserver.filterBySeverity", "Filter logs by severity")}</span>
|
|
<select
|
|
id="devserver-log-severity-filter"
|
|
className="select devserver-log-viewer__severity-select"
|
|
value={severityFilter}
|
|
onChange={(event) => setSeverityFilter(event.target.value as LogSeverityFilter)}
|
|
data-testid="devserver-log-severity-filter"
|
|
aria-label={t("devserver.filterBySeverity", "Filter logs by severity")}
|
|
>
|
|
<option value="all">{t("devserver.allSeverities", "All severities")}</option>
|
|
<option value="info">{t("devserver.info", "Info")}</option>
|
|
<option value="warn">{t("devserver.warn", "Warn")}</option>
|
|
<option value="error">{t("devserver.error", "Error")}</option>
|
|
</select>
|
|
</label>
|
|
|
|
<label className="devserver-log-viewer__search" htmlFor="devserver-log-search">
|
|
<span className="visually-hidden">{t("devserver.searchLogs", "Search logs")}</span>
|
|
<Search size={14} />
|
|
<input
|
|
id="devserver-log-search"
|
|
className="input devserver-log-viewer__search-input"
|
|
type="text"
|
|
value={searchQuery}
|
|
onChange={(event) => setSearchQuery(event.target.value)}
|
|
placeholder={t("devserver.searchLogs", "Search logs")}
|
|
data-testid="devserver-log-search-input"
|
|
aria-label={t("devserver.searchLogs", "Search logs")}
|
|
/>
|
|
</label>
|
|
|
|
{searchQuery.trim().length > 0 && (
|
|
<span className="devserver-log-viewer__matches" data-testid="devserver-log-match-count">
|
|
{t("devserver.matchCount", { count: matchCount, defaultValue_one: "{{count}} match", defaultValue_other: "{{count}} matches" })}
|
|
</span>
|
|
)}
|
|
|
|
<button
|
|
type="button"
|
|
className="btn btn-sm btn-icon"
|
|
onClick={() => setIsFullscreen((prev) => !prev)}
|
|
data-testid="devserver-log-fullscreen-toggle"
|
|
aria-label={isFullscreen ? t("devserver.exitFullscreen", "Exit fullscreen logs") : t("devserver.enterFullscreen", "Enter fullscreen logs")}
|
|
>
|
|
{isFullscreen ? <Minimize2 size={14} /> : <Maximize2 size={14} />}
|
|
</button>
|
|
</div>
|
|
</header>
|
|
|
|
<div className="devserver-log-viewer__body">
|
|
{hasMore && (
|
|
<div className="devserver-log-viewer__load-more" data-testid="devserver-log-load-more">
|
|
<button
|
|
type="button"
|
|
className="btn btn-sm touch-target"
|
|
onClick={onLoadMore}
|
|
disabled={loadingMore}
|
|
data-testid="devserver-log-load-more-button"
|
|
>
|
|
{loadingMore ? (
|
|
<>
|
|
<Loader2 size={14} className="devserver-log-viewer__spinner" />
|
|
{t("devserver.loadingOlderLogs", "Loading older logs…")}
|
|
</>
|
|
) : (
|
|
t("devserver.loadOlderLogs", "Load older logs")
|
|
)}
|
|
</button>
|
|
</div>
|
|
)}
|
|
|
|
<div
|
|
ref={containerRef}
|
|
className="devserver-log-viewer__content"
|
|
onScroll={handleScroll}
|
|
data-testid="devserver-log-content"
|
|
>
|
|
{!loading && filteredEntries.length === 0 && (
|
|
<p className="devserver-log-viewer__empty" data-testid="devserver-log-empty">
|
|
{entries.length === 0
|
|
? t("devserver.noLogsYet", "No logs yet. Start the dev server to see output.")
|
|
: (filteredBySeverity.length === 0
|
|
? t("devserver.noMatchesSeverity", "No log lines match the selected severity.")
|
|
: t("devserver.noMatchesSearch", "No log lines match your search."))}
|
|
</p>
|
|
)}
|
|
|
|
{filteredEntries.map((entry) => {
|
|
const plainText = stripAnsi(entry.text);
|
|
const timestamp = formatTime(entry.timestamp);
|
|
|
|
return (
|
|
<div className="devserver-log-line" key={entry.id}>
|
|
{timestamp && (
|
|
<span className="devserver-log-timestamp" data-testid="devserver-log-timestamp">{timestamp}</span>
|
|
)}
|
|
{entry.stream === "stderr" && (
|
|
<span className="devserver-log-stream-badge" data-testid="devserver-log-stderr-badge">{t("devserver.errBadge", "ERR")}</span>
|
|
)}
|
|
<span className="devserver-log-text">{linkifyReactChildren(highlightText(plainText, searchQuery.trim()))}</span>
|
|
</div>
|
|
);
|
|
})}
|
|
</div>
|
|
|
|
{isUserScrolling && isRunning && (
|
|
<button
|
|
type="button"
|
|
className="btn btn-sm devserver-log-viewer__new-logs-button"
|
|
onClick={scrollToBottom}
|
|
data-testid="devserver-log-jump-button"
|
|
>
|
|
<ChevronDown size={14} />
|
|
{t("devserver.newLogs", "New logs")}
|
|
</button>
|
|
)}
|
|
</div>
|
|
</section>
|
|
);
|
|
}
|
|
|
|
export type { DevServerLogViewerProps };
|