From 227217561ccacbf8f0f68baf2072ce29ac9dd28c 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 #3873 --- frontend/src/Activity/History/HistoryRow.js | 15 ++++++++++++--- frontend/src/Activity/Queue/QueueRow.js | 11 ++++++++++- frontend/src/Artist/History/ArtistHistoryRow.js | 17 ++++++++++++++++- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js index 632355eab..98925f6db 100644 --- a/frontend/src/Activity/History/HistoryRow.js +++ b/frontend/src/Activity/History/HistoryRow.js @@ -8,7 +8,8 @@ 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 formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore'; import HistoryDetailsModal from './Details/HistoryDetailsModal'; import HistoryEventTypeCell from './HistoryEventTypeCell'; @@ -187,7 +188,14 @@ class HistoryRow extends Component { key={name} className={styles.customFormatScore} > - {formatPreferredWordScore(customFormatScore)} + } + position={tooltipPositions.BOTTOM} + /> ); } @@ -272,7 +280,8 @@ HistoryRow.propTypes = { HistoryRow.defaultProps = { track: { title: '' - } + }, + customFormats: [] }; export default HistoryRow; diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js index d618b4854..e6a9d3bfd 100644 --- a/frontend/src/Activity/Queue/QueueRow.js +++ b/frontend/src/Activity/Queue/QueueRow.js @@ -14,6 +14,7 @@ import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableSelectCell from 'Components/Table/Cells/TableSelectCell'; import TableRow from 'Components/Table/TableRow'; import Popover from 'Components/Tooltip/Popover'; +import Tooltip from 'Components/Tooltip/Tooltip'; import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import InteractiveImportModal from 'InteractiveImport/InteractiveImportModal'; import formatBytes from 'Utilities/Number/formatBytes'; @@ -234,7 +235,14 @@ class QueueRow extends Component { key={name} className={styles.customFormatScore} > - {formatPreferredWordScore(customFormatScore)} + } + position={tooltipPositions.BOTTOM} + /> ); } @@ -433,6 +441,7 @@ QueueRow.propTypes = { }; QueueRow.defaultProps = { + customFormats: [], isGrabbing: false, isRemoving: false }; diff --git a/frontend/src/Artist/History/ArtistHistoryRow.js b/frontend/src/Artist/History/ArtistHistoryRow.js index ff5d4b711..282fa55ba 100644 --- a/frontend/src/Artist/History/ArtistHistoryRow.js +++ b/frontend/src/Artist/History/ArtistHistoryRow.js @@ -2,6 +2,7 @@ import PropTypes from 'prop-types'; import React, { Component } from 'react'; import HistoryDetailsConnector from 'Activity/History/Details/HistoryDetailsConnector'; import HistoryEventTypeCell from 'Activity/History/HistoryEventTypeCell'; +import AlbumFormats from 'Album/AlbumFormats'; import TrackQuality from 'Album/TrackQuality'; import Icon from 'Components/Icon'; import IconButton from 'Components/Link/IconButton'; @@ -10,6 +11,7 @@ import RelativeDateCellConnector from 'Components/Table/Cells/RelativeDateCellCo import TableRowCell from 'Components/Table/Cells/TableRowCell'; import TableRow from 'Components/Table/TableRow'; import Popover from 'Components/Tooltip/Popover'; +import Tooltip from 'Components/Tooltip/Tooltip'; import { icons, kinds, tooltipPositions } from 'Helpers/Props'; import formatPreferredWordScore from 'Utilities/Number/formatPreferredWordScore'; import translate from 'Utilities/String/translate'; @@ -76,6 +78,7 @@ class ArtistHistoryRow extends Component { sourceTitle, quality, qualityCutoffNotMet, + customFormats, customFormatScore, date, data, @@ -132,7 +135,14 @@ class ArtistHistoryRow extends Component { - {formatPreferredWordScore(customFormatScore)} + } + position={tooltipPositions.BOTTOM} + /> @@ -166,6 +176,7 @@ ArtistHistoryRow.propTypes = { sourceTitle: PropTypes.string.isRequired, quality: PropTypes.object.isRequired, qualityCutoffNotMet: PropTypes.bool.isRequired, + customFormats: PropTypes.arrayOf(PropTypes.object), customFormatScore: PropTypes.number.isRequired, date: PropTypes.string.isRequired, data: PropTypes.object.isRequired, @@ -175,4 +186,8 @@ ArtistHistoryRow.propTypes = { onMarkAsFailedPress: PropTypes.func.isRequired }; +ArtistHistoryRow.defaultProps = { + customFormats: [] +}; + export default ArtistHistoryRow;