From f83ea5a6fb3230baef4a2d1da51a0df162d7b520 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Tue, 21 Jun 2022 08:15:45 -0400 Subject: [PATCH] Merge pull request #8511 from overleaf/em-stop-on-first-error-info-badge Replace stop-on-first-error beta badge with info badge GitOrigin-RevId: d0f8d1c6e960646bd257aeaf5efc21b23615242b --- .../components/pdf-preview-error.js | 25 ++------------ .../components/stop-on-first-error-prompt.js | 27 ++------------- .../preview-logs-pane-max-entries.js | 25 ++------------ .../components/stop-on-first-error-badge.tsx | 33 +++++++++++++++++++ 4 files changed, 42 insertions(+), 68 deletions(-) create mode 100644 services/web/frontend/js/shared/components/stop-on-first-error-badge.tsx diff --git a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.js b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.js index 9e4def56cd..3ddd04b789 100644 --- a/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.js +++ b/services/web/frontend/js/features/pdf-preview/components/pdf-preview-error.js @@ -1,11 +1,11 @@ import PropTypes from 'prop-types' import { useTranslation, Trans } from 'react-i18next' -import { memo, useCallback, useMemo } from 'react' +import { memo, useCallback } from 'react' import { Button } from 'react-bootstrap' import PdfLogEntry from './pdf-log-entry' import { useDetachCompileContext as useCompileContext } from '../../../shared/context/detach-compile-context' import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error' -import BetaBadge from '../../../shared/components/beta-badge' +import StopOnFirstErrorBadge from '../../../shared/components/stop-on-first-error-badge' import getMeta from '../../../utils/meta' function PdfPreviewError({ error }) { @@ -181,22 +181,6 @@ function TimedOutLogEntry() { setAnimateCompileDropdownArrow(true) }, [enableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow]) - const betaBadgeTooltip = useMemo( - () => ({ - id: 'stop-on-first-error-tooltip', - placement: 'bottom', - className: 'tooltip-wide', - text: ( - <> - We are beta testing the “Stop on first error” compilation mode. -
- Click to give feedback - - ), - }), - [] - ) - if (showStopOnFirstError) { return ( @@ -233,10 +217,7 @@ function TimedOutLogEntry() { />, ]} />{' '} - + )} diff --git a/services/web/frontend/js/features/pdf-preview/components/stop-on-first-error-prompt.js b/services/web/frontend/js/features/pdf-preview/components/stop-on-first-error-prompt.js index 4c2db80106..3c7a8cbed4 100644 --- a/services/web/frontend/js/features/pdf-preview/components/stop-on-first-error-prompt.js +++ b/services/web/frontend/js/features/pdf-preview/components/stop-on-first-error-prompt.js @@ -1,10 +1,10 @@ -import { useCallback, useMemo } from 'react' +import { useCallback } from 'react' import { useTranslation, Trans } from 'react-i18next' import { Button } from 'react-bootstrap' import PdfLogEntry from './pdf-log-entry' import { useDetachCompileContext as useCompileContext } from '../../../shared/context/detach-compile-context' import { useStopOnFirstError } from '../../../shared/hooks/use-stop-on-first-error' -import BetaBadge from '../../../shared/components/beta-badge' +import StopOnFirstErrorBadge from '../../../shared/components/stop-on-first-error-badge' export default function StopOnFirstErrorPrompt() { const { t } = useTranslation() @@ -19,31 +19,10 @@ export default function StopOnFirstErrorPrompt() { setAnimateCompileDropdownArrow(true) }, [disableStopOnFirstError, startCompile, setAnimateCompileDropdownArrow]) - const betaBadgeTooltip = useMemo( - () => ({ - id: 'stop-on-first-error-tooltip', - placement: 'right', - className: 'tooltip-wide', - text: ( - <> - We are beta testing the “Stop on first error” compilation mode. -
- Click to give feedback - - ), - }), - [] - ) - return ( - } + headerIcon={} formattedContent={ <> ({ - id: 'stop-on-first-error-tooltip', - placement: 'bottom', - className: 'tooltip-wide', - text: ( - <> - We are beta testing the “Stop on first error” compilation mode. -
- Click to give feedback - - ), - }), - [] - ) - return (
@@ -73,10 +57,7 @@ function PreviewLogsPaneMaxEntries({ totalEntries, entriesShown, hasErrors }) { ), }} />{' '} - +

{t('log_entry_maximum_entries_see_full_logs')}

diff --git a/services/web/frontend/js/shared/components/stop-on-first-error-badge.tsx b/services/web/frontend/js/shared/components/stop-on-first-error-badge.tsx new file mode 100644 index 0000000000..3909fe9327 --- /dev/null +++ b/services/web/frontend/js/shared/components/stop-on-first-error-badge.tsx @@ -0,0 +1,33 @@ +import Tooltip from './tooltip' + +type Props = { + placement: string +} + +export default function StopOnFirstErrorBadge({ placement }: Props) { + const content = ( + <> + We are testing the “Stop on first error” compilation mode. +
+ Click to give feedback + + ) + + return ( + + + {content} + + + ) +}