From 8047e5aa67d9de9b655b4e772327b9f82f19c619 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sat, 23 Jan 2021 19:15:36 -0800 Subject: [PATCH] Fixed: Series Type Filter Closes #4274 --- .../Filter/Builder/FilterBuilderRow.js | 4 ++++ .../Builder/FilterBuilderRowValueTag.css | 3 ++- .../Builder/FilterBuilderRowValueTag.js | 11 ++++++----- .../SeriesTypeFilterBuilderRowValue.js | 19 +++++++++++++++++++ 4 files changed, 31 insertions(+), 6 deletions(-) create mode 100644 frontend/src/Components/Filter/Builder/SeriesTypeFilterBuilderRowValue.js diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js index 7c3ab83e1..3b2ba0a53 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js @@ -12,6 +12,7 @@ import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue'; import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector'; import QualityProfileFilterBuilderRowValueConnector from './QualityProfileFilterBuilderRowValueConnector'; import SeriesStatusFilterBuilderRowValue from './SeriesStatusFilterBuilderRowValue'; +import SeriesTypeFilterBuilderRowValue from './SeriesTypeFilterBuilderRowValue'; import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector'; import styles from './FilterBuilderRow.css'; @@ -75,6 +76,9 @@ function getRowValueConnector(selectedFilterBuilderProp) { case filterBuilderValueTypes.SERIES_STATUS: return SeriesStatusFilterBuilderRowValue; + case filterBuilderValueTypes.SERIES_TYPES: + return SeriesTypeFilterBuilderRowValue; + case filterBuilderValueTypes.TAG: return TagFilterBuilderRowValueConnector; diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css index 461a54aaa..86ef9e73a 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.css @@ -1,5 +1,5 @@ .tag { - height: 21px; + display: flex; &.isLastTag { .or { @@ -18,4 +18,5 @@ .or { margin: 0 3px; color: $themeDarkColor; + line-height: 31px; } diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js index 573e05759..9166666de 100644 --- a/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js +++ b/frontend/src/Components/Filter/Builder/FilterBuilderRowValueTag.js @@ -6,7 +6,7 @@ import styles from './FilterBuilderRowValueTag.css'; function FilterBuilderRowValueTag(props) { return ( - { - !props.isLastTag && - + props.isLastTag ? + null : +
or - +
} -
+ ); } diff --git a/frontend/src/Components/Filter/Builder/SeriesTypeFilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/SeriesTypeFilterBuilderRowValue.js new file mode 100644 index 000000000..263c9e9da --- /dev/null +++ b/frontend/src/Components/Filter/Builder/SeriesTypeFilterBuilderRowValue.js @@ -0,0 +1,19 @@ +import React from 'react'; +import FilterBuilderRowValue from './FilterBuilderRowValue'; + +const seriesTypeList = [ + { id: 'anime', name: 'Anime' }, + { id: 'daily', name: 'Daily' }, + { id: 'standard', name: 'Standard' } +]; + +function SeriesTypeFilterBuilderRowValue(props) { + return ( + + ); +} + +export default SeriesTypeFilterBuilderRowValue;