self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2025-01-25 11:13:39 +02:00
Code Issues Releases Activity

Series type filter/sort

Browse Source 
New: Filter/sort by series type
Fixed: Filtering excluding multiple values (is not x or y)
This commit is contained in:
Mark McDowall 2019-01-09 19:33:33 -08:00
parent 3b565d8bb1
commit ba5e2cfc45
6 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/Helpers/Props/filterBuilderValueTypes.js
View File

@ -8,4 +8,5 @@ export const PROTOCOL = 'protocol';
export const QUALITY = 'quality';
export const QUALITY_PROFILE = 'qualityProfile';
export const SERIES_STATUS = 'seriesStatus';
export const SERIES_TYPES = 'seriesType';
export const TAG = 'tag';

6
frontend/src/Series/Index/Table/SeriesIndexHeader.css
View File

@ -14,6 +14,12 @@
flex: 0 0 379px;
}
.seriesType {
composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';
flex: 0 0 100px;
}
.network {
composes: headerCell from 'Components/Table/VirtualTableHeaderCell.css';

6
frontend/src/Series/Index/Table/SeriesIndexRow.css
View File

@ -17,6 +17,12 @@
flex: 4 0 110px;
}
.seriesType {
composes: cell;
flex: 0 0 100px;
}
.banner {
flex: 0 0 379px;
}

16
frontend/src/Series/Index/Table/SeriesIndexRow.js
View File

@ -1,8 +1,9 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classNames from 'classnames';
import getProgressBarKind from 'Utilities/Series/getProgressBarKind';
import formatBytes from 'Utilities/Number/formatBytes';
import getProgressBarKind from 'Utilities/Series/getProgressBarKind';
import titleCase from 'Utilities/String/titleCase';
import { icons } from 'Helpers/Props';
import HeartRating from 'Components/HeartRating';
import IconButton from 'Components/Link/IconButton';
@ -83,6 +84,7 @@ class SeriesIndexRow extends Component {
status,
title,
titleSlug,
seriesType,
network,
qualityProfile,
languageProfile,
@ -187,6 +189,17 @@ class SeriesIndexRow extends Component {
);
}
if (name === 'seriesType') {
return (
<VirtualTableRowCell
key={name}
className={styles[name]}
>
{titleCase(seriesType)}
</VirtualTableRowCell>
);
}
if (name === 'network') {
return (
<VirtualTableRowCell
@ -477,6 +490,7 @@ SeriesIndexRow.propTypes = {
status: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
titleSlug: PropTypes.string.isRequired,
seriesType: PropTypes.string.isRequired,
network: PropTypes.string,
qualityProfile: PropTypes.object.isRequired,
languageProfile: PropTypes.object.isRequired,

12
frontend/src/Store/Actions/seriesIndexActions.js
View File

@ -66,6 +66,12 @@ export const defaultState = {
isVisible: true,
isModifiable: false
},
{
name: 'seriesType',
label: 'Type',
isSortable: true,
isVisible: false
},
{
name: 'network',
label: 'Network',
@ -255,6 +261,12 @@ export const defaultState = {
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.SERIES_STATUS
},
{
name: 'seriesType',
label: 'Type',
type: filterBuilderTypes.EXACT,
valueType: filterBuilderValueTypes.SERIES_TYPES
},
{
name: 'network',
label: 'Network',

9
frontend/src/Store/Selectors/createClientSideCollectionSelector.js
View File

@ -52,7 +52,14 @@ function filter(items, state) {
const predicate = filterTypePredicates[type];
if (Array.isArray(value)) {
accepted = value.some((v) => predicate(item[key], v));
if (
type === filterTypes.NOT_CONTAINS ||
type === filterTypes.NOT_EQUAL
) {
accepted = value.every((v) => predicate(item[key], v));
} else {
accepted = value.some((v) => predicate(item[key], v));
}
} else {
accepted = predicate(item[key], value);
}