From a06b044342c183a5fb257a6df2e849479444631d Mon Sep 17 00:00:00 2001 From: geogolem <55031547+geogolem@users.noreply.github.com> Date: Fri, 15 Nov 2019 19:17:19 -0500 Subject: [PATCH] Fix: use isAvailable to determine if a movie is available. --- frontend/src/Movie/MovieStatus.js | 5 +++-- frontend/src/Movie/MovieStatusConnector.js | 1 + frontend/src/Store/Actions/movieActions.js | 23 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/frontend/src/Movie/MovieStatus.js b/frontend/src/Movie/MovieStatus.js index 046777078..269b9d18e 100644 --- a/frontend/src/Movie/MovieStatus.js +++ b/frontend/src/Movie/MovieStatus.js @@ -1,6 +1,5 @@ import PropTypes from 'prop-types'; import React from 'react'; -import isBefore from 'Utilities/Date/isBefore'; import { icons, kinds, sizes } from 'Helpers/Props'; import Icon from 'Components/Icon'; import ProgressBar from 'Components/ProgressBar'; @@ -30,6 +29,7 @@ function getTooltip(title, quality, size) { function MovieStatus(props) { const { inCinemas, + isAvailable, monitored, grabbed, queueItem, @@ -38,7 +38,7 @@ function MovieStatus(props) { const hasMovieFile = !!movieFile; const isQueued = !!queueItem; - const hasReleased = isBefore(inCinemas); + const hasReleased = isAvailable; if (isQueued) { const { @@ -144,6 +144,7 @@ function MovieStatus(props) { MovieStatus.propTypes = { inCinemas: PropTypes.string, + isAvailable: PropTypes.bool, monitored: PropTypes.bool.isRequired, grabbed: PropTypes.bool, queueItem: PropTypes.object, diff --git a/frontend/src/Movie/MovieStatusConnector.js b/frontend/src/Movie/MovieStatusConnector.js index 91e934e96..c3d721faa 100644 --- a/frontend/src/Movie/MovieStatusConnector.js +++ b/frontend/src/Movie/MovieStatusConnector.js @@ -14,6 +14,7 @@ function createMapStateToProps() { (movie, queueItem) => { const result = _.pick(movie, [ 'inCinemas', + 'isAvailable', 'monitored', 'grabbed' ]); diff --git a/frontend/src/Store/Actions/movieActions.js b/frontend/src/Store/Actions/movieActions.js index 3d67d4313..3dbcfb02f 100644 --- a/frontend/src/Store/Actions/movieActions.js +++ b/frontend/src/Store/Actions/movieActions.js @@ -45,9 +45,25 @@ export const filters = [ } ] }, + { + key: 'missing', + label: 'Missing', + filters: [ + { + key: 'monitored', + value: true, + type: filterTypes.EQUAL + }, + { + key: 'hasFile', + value: false, + type: filterTypes.EQUAL + } + ] + }, { key: 'wanted', - label: 'Wanted Missing', + label: 'Wanted', filters: [ { key: 'monitored', @@ -58,6 +74,11 @@ export const filters = [ key: 'hasFile', value: false, type: filterTypes.EQUAL + }, + { + key: 'isAvailable', + value: true, + type: filterTypes.EQUAL } ] },