Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Series index selector improvements

This commit is contained in:
Mark McDowall 2019-04-05 20:17:24 -07:00
parent a63ca0f0e9
commit 2b63110323
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/Series/Index/Overview/SeriesIndexOverviewsConnector.js
View File

@ -1,6 +1,5 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import SeriesIndexOverviews from './SeriesIndexOverviews'; import SeriesIndexOverviews from './SeriesIndexOverviews';
@ -8,18 +7,16 @@ import SeriesIndexOverviews from './SeriesIndexOverviews';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.seriesIndex.overviewOptions, (state) => state.seriesIndex.overviewOptions,
createClientSideCollectionSelector('series', 'seriesIndex'),
createUISettingsSelector(), createUISettingsSelector(),
createDimensionsSelector(), createDimensionsSelector(),
(overviewOptions, series, uiSettings, dimensions) => { (overviewOptions, uiSettings, dimensions) => {
return { return {
overviewOptions, overviewOptions,
showRelativeDates: uiSettings.showRelativeDates, showRelativeDates: uiSettings.showRelativeDates,
shortDateFormat: uiSettings.shortDateFormat, shortDateFormat: uiSettings.shortDateFormat,
longDateFormat: uiSettings.longDateFormat, longDateFormat: uiSettings.longDateFormat,
timeFormat: uiSettings.timeFormat, timeFormat: uiSettings.timeFormat,
isSmallScreen: dimensions.isSmallScreen, isSmallScreen: dimensions.isSmallScreen
...series
}; };
} }
); );

7
frontend/src/Series/Index/Posters/SeriesIndexPostersConnector.js
View File

@ -1,6 +1,5 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector'; import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector'; import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
import SeriesIndexPosters from './SeriesIndexPosters'; import SeriesIndexPosters from './SeriesIndexPosters';
@ -8,17 +7,15 @@ import SeriesIndexPosters from './SeriesIndexPosters';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.seriesIndex.posterOptions, (state) => state.seriesIndex.posterOptions,
createClientSideCollectionSelector('series', 'seriesIndex'),
createUISettingsSelector(), createUISettingsSelector(),
createDimensionsSelector(), createDimensionsSelector(),
(posterOptions, series, uiSettings, dimensions) => { (posterOptions, uiSettings, dimensions) => {
return { return {
posterOptions, posterOptions,
showRelativeDates: uiSettings.showRelativeDates, showRelativeDates: uiSettings.showRelativeDates,
shortDateFormat: uiSettings.shortDateFormat, shortDateFormat: uiSettings.shortDateFormat,
timeFormat: uiSettings.timeFormat, timeFormat: uiSettings.timeFormat,
isSmallScreen: dimensions.isSmallScreen, isSmallScreen: dimensions.isSmallScreen
...series
}; };
} }
); );

4
frontend/src/Series/Index/SeriesIndex.js
View File

@ -320,6 +320,10 @@ class SeriesIndex extends Component {
<div className={styles.contentBodyContainer}> <div className={styles.contentBodyContainer}>
<ViewComponent <ViewComponent
contentBody={contentBody} contentBody={contentBody}
items={items}
filters={filters}
sortKey={sortKey}
sortDirection={sortDirection}
scrollTop={scrollTop} scrollTop={scrollTop}
jumpToCharacter={jumpToCharacter} jumpToCharacter={jumpToCharacter}
onRender={this.onRender} onRender={this.onRender}

10
frontend/src/Series/Index/Table/SeriesIndexTableConnector.js
View File

@ -1,18 +1,18 @@
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
import { setSeriesSort } from 'Store/Actions/seriesIndexActions'; import { setSeriesSort } from 'Store/Actions/seriesIndexActions';
import SeriesIndexTable from './SeriesIndexTable'; import SeriesIndexTable from './SeriesIndexTable';
function createMapStateToProps() { function createMapStateToProps() {
return createSelector( return createSelector(
(state) => state.app.dimensions, (state) => state.app.dimensions,
createClientSideCollectionSelector('series', 'seriesIndex'), (state) => state.seriesIndex.tableOptions,
(dimensions, series) => { (state) => state.seriesIndex.columns,
(dimensions, tableOptions, columns) => {
return { return {
isSmallScreen: dimensions.isSmallScreen, isSmallScreen: dimensions.isSmallScreen,
...series, showBanners: tableOptions.showBanners,
showBanners: series.tableOptions.showBanners columns
}; };
} }
); );