From f8cbca79589a7a1a9c09f4f74a6034496f792299 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sat, 15 Jul 2023 20:29:47 +0300 Subject: [PATCH] New: Show tooltips with Custom Formats in History and Queue (cherry picked from commit d6aee683dc4e8a8c94993b30df21fe8f6c5106b3) Closes #8819 --- frontend/src/Activity/History/HistoryRow.js | 18 +++++++++++++++--- frontend/src/Activity/Queue/QueueRow.js | 13 +++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js index d294b1ec4..e14936e42 100644 --- a/frontend/src/Activity/History/HistoryRow.js +++ b/frontend/src/Activity/History/HistoryRow.js @@ -4,12 +4,13 @@ import IconButton from 'Components/Link/IconButton'; import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellConnector'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableRow from 'Components/Table/TableRow'; -import { icons } from 'Helpers/Props'; +import Tooltip from 'Components/Tooltip/Tooltip'; +import { icons, tooltipPositions } from 'Helpers/Props'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; import MovieQuality from 'Movie/MovieQuality'; import MovieTitleLink from 'Movie/MovieTitleLink'; -import formatCustomFormatScore from 'Utilities/Number/formatCustomFormatScore'; +import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore'; import HistoryDetailsModal from './Details/HistoryDetailsModal'; import HistoryEventTypeCell from './HistoryEventTypeCell'; import styles from './HistoryRow.css'; @@ -176,7 +177,14 @@ class HistoryRow extends Component { key={name} className={styles.customFormatScore} > - {formatCustomFormatScore(customFormatScore)} + } + position={tooltipPositions.BOTTOM} + /> ); } @@ -257,4 +265,8 @@ HistoryRow.propTypes = { onMarkAsFailedPress: PropTypes.func.isRequired }; +HistoryRow.defaultProps = { + customFormats: [] +}; + export default HistoryRow; diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js index 3aeff169c..419ac0b38 100644 --- a/frontend/src/Activity/Queue/QueueRow.js +++ b/frontend/src/Activity/Queue/QueueRow.js @@ -8,7 +8,8 @@ import ProgressBar from 'Components/ProgressBar'; import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableSelectCell from 'Components/Table/Cells/TableSelectCell'; import TableRow from 'Components/Table/TableRow'; -import { icons, kinds } from 'Helpers/Props'; +import Tooltip from 'Components/Tooltip/Tooltip'; +import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; import MovieFormats from 'Movie/MovieFormats'; import MovieLanguage from 'Movie/MovieLanguage'; @@ -209,7 +210,14 @@ class QueueRow extends Component { key={name} className={styles.customFormatScore} > - {formatPreferredWordScore(customFormatScore)} + } + position={tooltipPositions.BOTTOM} + /> ); } @@ -404,6 +412,7 @@ QueueRow.propTypes = { }; QueueRow.defaultProps = { + customFormats: [], isGrabbing: false, isRemoving: false };