From 0040c31b1f095bbcffbb7a39b99a8817213b344f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Alby?= Date: Tue, 5 Jan 2021 11:56:38 +0100 Subject: [PATCH] Merge pull request #3474 from overleaf/hb-show-log-type Show log type in react log entry UI GitOrigin-RevId: 4e600b7d763b357d86f1b99d56aca01f62dc30bf --- .../preview/components/preview-logs-pane-entry.js | 9 ++++++++- .../js/features/preview/components/preview-logs-pane.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/services/web/frontend/js/features/preview/components/preview-logs-pane-entry.js b/services/web/frontend/js/features/preview/components/preview-logs-pane-entry.js index 95f74a9aa8..ecf7249e76 100644 --- a/services/web/frontend/js/features/preview/components/preview-logs-pane-entry.js +++ b/services/web/frontend/js/features/preview/components/preview-logs-pane-entry.js @@ -10,6 +10,7 @@ import Icon from '../../../shared/components/icon' function PreviewLogsPaneEntry({ headerTitle, rawContent, + logType, formattedContent, extraInfoURL, level, @@ -34,6 +35,7 @@ function PreviewLogsPaneEntry({ level={level} sourceLocation={sourceLocation} headerTitle={headerTitle} + logType={logType} showSourceLocationLink={showSourceLocationLink} onSourceLocationClick={handleLogEntryLinkClick} showCloseButton={showCloseButton} @@ -54,6 +56,7 @@ function PreviewLogEntryHeader({ sourceLocation, level, headerTitle, + logType, showSourceLocationLink = true, showCloseButton = false, onSourceLocationClick, @@ -130,9 +133,11 @@ function PreviewLogEntryHeader({ ) : null + var headerTitleText = logType ? `${logType} ${headerTitle}` : headerTitle + return (
-

{headerTitle}

+

{headerTitleText}

{showLocationTooltip ? ( {locationLink} @@ -230,6 +235,7 @@ PreviewLogEntryHeader.propTypes = { }), level: PropTypes.string.isRequired, headerTitle: PropTypes.string, + logType: PropTypes.string, showSourceLocationLink: PropTypes.bool, showCloseButton: PropTypes.bool, onSourceLocationClick: PropTypes.func, @@ -246,6 +252,7 @@ PreviewLogsPaneEntry.propTypes = { sourceLocation: PreviewLogEntryHeader.propTypes.sourceLocation, headerTitle: PropTypes.string, rawContent: PropTypes.string, + logType: PropTypes.string, formattedContent: PropTypes.node, extraInfoURL: PropTypes.string, level: PropTypes.oneOf(['error', 'warning', 'typesetting', 'raw']).isRequired, diff --git a/services/web/frontend/js/features/preview/components/preview-logs-pane.js b/services/web/frontend/js/features/preview/components/preview-logs-pane.js index be5fea2548..d37c44386b 100644 --- a/services/web/frontend/js/features/preview/components/preview-logs-pane.js +++ b/services/web/frontend/js/features/preview/components/preview-logs-pane.js @@ -50,6 +50,7 @@ function PreviewLogsPane({ key={idx} headerTitle={logEntry.message} rawContent={logEntry.content} + logType={logEntry.type} formattedContent={logEntry.humanReadableHintComponent} extraInfoURL={logEntry.extraInfoURL} level={logEntry.level}