From 408a55460a15b32a92c5468f78619fcdcdbfed59 Mon Sep 17 00:00:00 2001 From: David <33458145+davidmcpowell@users.noreply.github.com> Date: Thu, 4 Sep 2025 09:57:39 +0100 Subject: [PATCH] Merge pull request #28269 from overleaf/dp-expand-compile-timeout-messages Update compile timeout log behaviour in new logs GitOrigin-RevId: e3bc555dff859fc16dad4749b84b9fc2a3f7d151 --- .../components/error-logs/error-logs.tsx | 13 +++++++------ .../components/error-logs/log-entry.tsx | 4 ++-- .../pdf-preview/components/pdf-log-entry.tsx | 3 +++ .../pdf-preview/components/pdf-logs-entries.tsx | 1 + .../pdf-preview/components/pdf-preview-error.tsx | 5 ++++- .../components/timeout-upgrade-prompt-new.tsx | 2 ++ 6 files changed, 19 insertions(+), 9 deletions(-) diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx index ffc305939f..be4ba09660 100644 --- a/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx +++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/error-logs.tsx @@ -12,6 +12,8 @@ import { Nav, NavLink, TabContainer, TabContent } from 'react-bootstrap' import { LogEntry as LogEntryData } from '@/features/pdf-preview/util/types' import LogEntry from './log-entry' import importOverleafModules from '../../../../../macros/import-overleaf-module.macro' +import TimeoutUpgradePromptNew from '@/features/pdf-preview/components/timeout-upgrade-prompt-new' +import getMeta from '@/utils/meta' const logsComponents: Array<{ import: { default: ElementType } @@ -27,6 +29,7 @@ type ErrorLogTab = { function ErrorLogs() { const { error, logEntries, rawLog, validationIssues, stoppedOnFirstError } = useCompileContext() + const { compileTimeout } = getMeta('ol-compileSettings') const tabs = useMemo(() => { return [ @@ -72,12 +75,10 @@ function ErrorLogs() { /> )} - {error && ( - + {compileTimeout < 60 && error === 'timedout' ? ( + + ) : ( + <>{error && } )} {includeErrors && diff --git a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx index 4ff66ba6d3..47e090c168 100644 --- a/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx +++ b/services/web/frontend/js/features/ide-redesign/components/error-logs/log-entry.tsx @@ -39,8 +39,8 @@ type LogEntryProps = { openCollapseIconOverride?: string } -function LogEntry(props: LogEntryProps) { - const [collapsed, setCollapsed] = useState(props.index !== 0) +function LogEntry(props: LogEntryProps & { autoExpand?: boolean }) { + const [collapsed, setCollapsed] = useState(!props.autoExpand) return ( ( +

{t('project_timed_out_intro')}

  • diff --git a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx index 7247534c1d..d54b2f2a02 100644 --- a/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx +++ b/services/web/frontend/js/features/pdf-preview/components/timeout-upgrade-prompt-new.tsx @@ -66,6 +66,7 @@ const CompileTimeout = memo(function CompileTimeout({ return (