From 83eeb747dc56fd8d51a0917012eee50f0e745e01 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sat, 26 Oct 2019 12:56:00 -0400 Subject: [PATCH] Fixed: Status Filter using Series Filter Options --- .../Filter/Builder/FilterBuilderRow.js | 6 +++--- .../MovieStatusFilterBuilderRowValue.js | 20 +++++++++++++++++++ .../SeriesStatusFilterBuilderRowValue.js | 18 ----------------- .../Helpers/Props/filterBuilderValueTypes.js | 2 +- frontend/src/Store/Actions/addMovieActions.js | 2 +- .../src/Store/Actions/movieIndexActions.js | 2 +- 6 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js delete mode 100644 frontend/src/Components/Filter/Builder/SeriesStatusFilterBuilderRowValue.js diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js index 53f28a90e..e7f6da3fb 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js @@ -10,7 +10,7 @@ import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValu import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue'; import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector'; import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector'; -import SeriesStatusFilterBuilderRowValue from './SeriesStatusFilterBuilderRowValue'; +import MovieStatusFilterBuilderRowValue from './MovieStatusFilterBuilderRowValue'; import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector'; import styles from './FilterBuilderRow.css'; @@ -68,8 +68,8 @@ function getRowValueConnector(selectedFilterBuilderProp) { case filterBuilderValueTypes.QUALITY_PROFILE: return QualityProfileFilterBuilderRowValueConnector; - case filterBuilderValueTypes.SERIES_STATUS: - return SeriesStatusFilterBuilderRowValue; + case filterBuilderValueTypes.MOVIE_STATUS: + return MovieStatusFilterBuilderRowValue; case filterBuilderValueTypes.TAG: return TagFilterBuilderRowValueConnector; diff --git a/frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js new file mode 100644 index 000000000..6a75f5681 --- /dev/null +++ b/frontend/src/Components/Filter/Builder/MovieStatusFilterBuilderRowValue.js @@ -0,0 +1,20 @@ +import React from 'react'; +import FilterBuilderRowValue from './FilterBuilderRowValue'; + +const protocols = [ + { id: 'tba', name: 'TBA' }, + { id: 'announced', name: 'Announced' }, + { id: 'inCinemas', name: 'In Cinemas' }, + { id: 'released', name: 'Released' } +]; + +function MovieStatusFilterBuilderRowValue(props) { + return ( + + ); +} + +export default MovieStatusFilterBuilderRowValue; diff --git a/frontend/src/Components/Filter/Builder/SeriesStatusFilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/SeriesStatusFilterBuilderRowValue.js deleted file mode 100644 index 50841a013..000000000 --- a/frontend/src/Components/Filter/Builder/SeriesStatusFilterBuilderRowValue.js +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import FilterBuilderRowValue from './FilterBuilderRowValue'; - -const protocols = [ - { id: 'continuing', name: 'Continuing' }, - { id: 'ended', name: 'Ended' } -]; - -function SeriesStatusFilterBuilderRowValue(props) { - return ( - - ); -} - -export default SeriesStatusFilterBuilderRowValue; diff --git a/frontend/src/Helpers/Props/filterBuilderValueTypes.js b/frontend/src/Helpers/Props/filterBuilderValueTypes.js index b2e9cf1fc..0e9544bbc 100644 --- a/frontend/src/Helpers/Props/filterBuilderValueTypes.js +++ b/frontend/src/Helpers/Props/filterBuilderValueTypes.js @@ -6,5 +6,5 @@ export const INDEXER = 'indexer'; export const PROTOCOL = 'protocol'; export const QUALITY = 'quality'; export const QUALITY_PROFILE = 'qualityProfile'; -export const SERIES_STATUS = 'seriesStatus'; +export const MOVIE_STATUS = 'movieStatus'; export const TAG = 'tag'; diff --git a/frontend/src/Store/Actions/addMovieActions.js b/frontend/src/Store/Actions/addMovieActions.js index d3a9b4458..fb880c869 100644 --- a/frontend/src/Store/Actions/addMovieActions.js +++ b/frontend/src/Store/Actions/addMovieActions.js @@ -163,7 +163,7 @@ export const defaultState = { name: 'status', label: 'Status', type: filterBuilderTypes.EXACT, - valueType: filterBuilderValueTypes.SERIES_STATUS + valueType: filterBuilderValueTypes.MOVIE_STATUS }, { name: 'studio', diff --git a/frontend/src/Store/Actions/movieIndexActions.js b/frontend/src/Store/Actions/movieIndexActions.js index 858cfb776..72a9ea3e8 100644 --- a/frontend/src/Store/Actions/movieIndexActions.js +++ b/frontend/src/Store/Actions/movieIndexActions.js @@ -196,7 +196,7 @@ export const defaultState = { name: 'status', label: 'Status', type: filterBuilderTypes.EXACT, - valueType: filterBuilderValueTypes.SERIES_STATUS + valueType: filterBuilderValueTypes.MOVIE_STATUS }, { name: 'studio',