From 17b8605751cb0ce5c0b690a49b75cadbbb9d080e Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 9 Nov 2023 20:38:33 +0200 Subject: [PATCH] Simply queue item for movie details page --- frontend/src/Movie/Details/MovieDetails.js | 6 +++--- frontend/src/Movie/Details/MovieDetailsConnector.js | 4 +++- frontend/src/Movie/Details/MovieStatusLabel.js | 5 ----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frontend/src/Movie/Details/MovieDetails.js b/frontend/src/Movie/Details/MovieDetails.js index 9b125ade38..fdde4d345e 100644 --- a/frontend/src/Movie/Details/MovieDetails.js +++ b/frontend/src/Movie/Details/MovieDetails.js @@ -286,7 +286,7 @@ class MovieDetails extends Component { onMonitorTogglePress, onRefreshPress, onSearchPress, - queueItems, + queueItem, movieRuntimeFormat } = this.props; @@ -544,7 +544,7 @@ class MovieDetails extends Component { hasMovieFiles={hasMovieFiles} monitored={monitored} isAvailable={isAvailable} - queueItem={(queueItems.length > 0) ? queueItems[0] : null} + queueItem={queueItem} /> @@ -830,7 +830,7 @@ MovieDetails.propTypes = { onRefreshPress: PropTypes.func.isRequired, onSearchPress: PropTypes.func.isRequired, onGoToMovie: PropTypes.func.isRequired, - queueItems: PropTypes.arrayOf(PropTypes.object), + queueItem: PropTypes.object, movieRuntimeFormat: PropTypes.string.isRequired }; diff --git a/frontend/src/Movie/Details/MovieDetailsConnector.js b/frontend/src/Movie/Details/MovieDetailsConnector.js index 5364feeea4..aaf4079e4a 100644 --- a/frontend/src/Movie/Details/MovieDetailsConnector.js +++ b/frontend/src/Movie/Details/MovieDetailsConnector.js @@ -145,6 +145,8 @@ function createMapStateToProps() { return acc; }, []); + const queueItem = queueItems.find((item) => item.movieId === movie.id); + return { ...movie, alternateTitles, @@ -165,7 +167,7 @@ function createMapStateToProps() { nextMovie, isSmallScreen: dimensions.isSmallScreen, isSidebarVisible, - queueItems, + queueItem, movieRuntimeFormat }; } diff --git a/frontend/src/Movie/Details/MovieStatusLabel.js b/frontend/src/Movie/Details/MovieStatusLabel.js index c1b3a7a98d..5534c56031 100644 --- a/frontend/src/Movie/Details/MovieStatusLabel.js +++ b/frontend/src/Movie/Details/MovieStatusLabel.js @@ -8,7 +8,6 @@ import translate from 'Utilities/String/translate'; import styles from './MovieStatusLabel.css'; function getMovieStatus(hasFile, isMonitored, isAvailable, queueItem = false) { - if (queueItem) { const queueStatus = queueItem.status; const queueState = queueItem.trackedDownloadStatus; @@ -116,8 +115,4 @@ MovieStatusLabel.propTypes = { colorImpairedMode: PropTypes.bool }; -MovieStatusLabel.defaultProps = { - title: '' -}; - export default MovieStatusLabel;