From b2a52e52b6b3b1e9b857fb409daac985d6b12e26 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Thu, 9 Nov 2023 18:20:45 +0200 Subject: [PATCH] Fixed: (UI) Progress bar status for searching existing movies --- .../AddMovie/AddNewMovie/AddNewMovieSearchResult.js | 12 ++++++------ .../AddNewMovie/AddNewMovieSearchResultConnector.js | 10 ++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js index 05fd4389f..5f4b973a1 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResult.js @@ -66,6 +66,7 @@ class AddNewMovieSearchResult extends Component { ratings, folder, images, + existingMovieId, isExistingMovie, isExclusionMovie, isSmallScreen, @@ -74,8 +75,7 @@ class AddNewMovieSearchResult extends Component { monitored, hasFile, isAvailable, - queueStatus, - queueState, + movieFile, runtime, movieRuntimeFormat, certification @@ -120,13 +120,13 @@ class AddNewMovieSearchResult extends Component { { isExistingMovie && } @@ -278,6 +278,7 @@ AddNewMovieSearchResult.propTypes = { ratings: PropTypes.object.isRequired, folder: PropTypes.string.isRequired, images: PropTypes.arrayOf(PropTypes.object).isRequired, + existingMovieId: PropTypes.number, isExistingMovie: PropTypes.bool.isRequired, isExclusionMovie: PropTypes.bool.isRequired, isSmallScreen: PropTypes.bool.isRequired, @@ -286,9 +287,8 @@ AddNewMovieSearchResult.propTypes = { monitored: PropTypes.bool.isRequired, hasFile: PropTypes.bool.isRequired, isAvailable: PropTypes.bool.isRequired, + movieFile: PropTypes.object, colorImpairedMode: PropTypes.bool, - queueStatus: PropTypes.string, - queueState: PropTypes.string, runtime: PropTypes.number.isRequired, movieRuntimeFormat: PropTypes.string.isRequired, certification: PropTypes.string diff --git a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js index 02b833454..ded3b66da 100644 --- a/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js +++ b/frontend/src/AddMovie/AddNewMovie/AddNewMovieSearchResultConnector.js @@ -10,17 +10,15 @@ function createMapStateToProps() { createExistingMovieSelector(), createExclusionMovieSelector(), createDimensionsSelector(), - (state) => state.queue.details.items, (state, { internalId }) => internalId, - (isExistingMovie, isExclusionMovie, dimensions, queueItems, internalId) => { - const firstQueueItem = queueItems.find((q) => q.movieId === internalId && internalId > 0); - + (state) => state.settings.ui.item.movieRuntimeFormat, + (isExistingMovie, isExclusionMovie, dimensions, internalId, movieRuntimeFormat) => { return { + existingMovieId: internalId, isExistingMovie, isExclusionMovie, isSmallScreen: dimensions.isSmallScreen, - queueStatus: firstQueueItem ? firstQueueItem.status : null, - queueState: firstQueueItem ? firstQueueItem.trackedDownloadState : null + movieRuntimeFormat }; } );