From 876c292d220d9e8bbfba0db9b2225fb30742b683 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 29 Sep 2020 12:08:49 +0100 Subject: [PATCH] Add compile status indicator to new React-based errors UI. GitOrigin-RevId: 545953e156d589a56ffd038bb7a40bba97770d06 --- services/web/app/views/project/editor/pdf.pug | 6 +- .../frontend/extracted-translation-keys.json | 6 +- .../preview/components/preview-log-entry.js | 3 +- .../components/preview-logs-toggle-button.js | 110 +++++++++++++++ .../preview/components/preview-pane.js | 28 +++- .../components/preview-recompile-button.js | 35 ++--- .../preview/components/preview-toolbar.js | 42 ++++-- .../web/frontend/js/ide/pdf/PdfManager.js | 2 +- .../js/ide/pdf/controllers/PdfController.js | 4 +- .../frontend/stylesheets/app/editor/pdf.less | 22 +++ .../frontend/stylesheets/core/variables.less | 2 +- .../preview-logs-toggle-button.test.js | 126 ++++++++++++++++++ 12 files changed, 334 insertions(+), 52 deletions(-) create mode 100644 services/web/frontend/js/features/preview/components/preview-logs-toggle-button.js create mode 100644 services/web/test/frontend/features/preview/components/preview-logs-toggle-button.test.js diff --git a/services/web/app/views/project/editor/pdf.pug b/services/web/app/views/project/editor/pdf.pug index 7333dc6871..121468cec5 100644 --- a/services/web/app/views/project/editor/pdf.pug +++ b/services/web/app/views/project/editor/pdf.pug @@ -5,16 +5,16 @@ div.full-size.pdf(ng-controller="PdfController") isAutoCompileOn: autocompile_enabled, isCompiling: pdf.compiling, isDraftModeOn: draft, - isSyntaxCheckOn: stop_on_validation_error + isSyntaxCheckOn: stop_on_validation_error, + logEntries: pdf.logEntries ? pdf.logEntries : {} }` - log-entries="pdf.logEntries ? pdf.logEntries.all : []" on-recompile="recompile" on-run-syntax-check-now="runSyntaxCheckNow" on-set-auto-compile="setAutoCompile" on-set-draft-mode="setDraftMode" on-set-syntax-check="setSyntaxCheck" on-toggle-logs="toggleLogs" - should-show-logs="shouldShowLogs" + show-logs="shouldShowLogs" ) else .toolbar.toolbar-pdf(ng-class="{ 'changes-to-autocompile': changesToAutoCompile && !autoCompileLintingError }") diff --git a/services/web/frontend/extracted-translation-keys.json b/services/web/frontend/extracted-translation-keys.json index 12aa76d6e8..2b66f41da2 100644 --- a/services/web/frontend/extracted-translation-keys.json +++ b/services/web/frontend/extracted-translation-keys.json @@ -21,5 +21,9 @@ "loading", "no_messages", "send_first_message", - "your_message" + "your_message", + "your_project_has_errors", + "view_warnings", + "view_logs", + "view_pdf" ] diff --git a/services/web/frontend/js/features/preview/components/preview-log-entry.js b/services/web/frontend/js/features/preview/components/preview-log-entry.js index b1c66bd429..e0c57ddc24 100644 --- a/services/web/frontend/js/features/preview/components/preview-log-entry.js +++ b/services/web/frontend/js/features/preview/components/preview-log-entry.js @@ -1,6 +1,7 @@ import React from 'react' import PropTypes from 'prop-types' import classNames from 'classnames' +import Icon from '../../../shared/components/icon' function PreviewLogEntry({ file, line, message, content, raw, level }) { const logEntryClasses = classNames('alert', { @@ -11,7 +12,7 @@ function PreviewLogEntry({ file, line, message, content, raw, level }) { return (
-