mirror of
https://github.com/lidarr/lidarr.git
synced 2025-07-16 10:03:51 -07:00
Fixed: ArtistIndex selector improvements
This commit is contained in:
parent
0db28d4ea2
commit
ec780c310c
5 changed files with 15 additions and 20 deletions
|
@ -348,6 +348,10 @@ class ArtistIndex extends Component {
|
|||
<div className={styles.contentBodyContainer}>
|
||||
<ViewComponent
|
||||
contentBody={contentBody}
|
||||
items={items}
|
||||
filters={filters}
|
||||
sortKey={sortKey}
|
||||
sortDirection={sortDirection}
|
||||
scrollTop={scrollTop}
|
||||
jumpToCharacter={jumpToCharacter}
|
||||
onRender={this.onRender}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
||||
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
|
||||
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
|
||||
import ArtistIndexBanners from './ArtistIndexBanners';
|
||||
|
@ -8,17 +7,15 @@ import ArtistIndexBanners from './ArtistIndexBanners';
|
|||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.artistIndex.bannerOptions,
|
||||
createClientSideCollectionSelector('artist', 'artistIndex'),
|
||||
createUISettingsSelector(),
|
||||
createDimensionsSelector(),
|
||||
(bannerOptions, artist, uiSettings, dimensions) => {
|
||||
(bannerOptions, uiSettings, dimensions) => {
|
||||
return {
|
||||
bannerOptions,
|
||||
showRelativeDates: uiSettings.showRelativeDates,
|
||||
shortDateFormat: uiSettings.shortDateFormat,
|
||||
timeFormat: uiSettings.timeFormat,
|
||||
isSmallScreen: dimensions.isSmallScreen,
|
||||
...artist
|
||||
isSmallScreen: dimensions.isSmallScreen
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
||||
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
|
||||
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
|
||||
import ArtistIndexOverviews from './ArtistIndexOverviews';
|
||||
|
@ -8,18 +7,16 @@ import ArtistIndexOverviews from './ArtistIndexOverviews';
|
|||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.artistIndex.overviewOptions,
|
||||
createClientSideCollectionSelector('artist', 'artistIndex'),
|
||||
createUISettingsSelector(),
|
||||
createDimensionsSelector(),
|
||||
(overviewOptions, artist, uiSettings, dimensions) => {
|
||||
(overviewOptions, uiSettings, dimensions) => {
|
||||
return {
|
||||
overviewOptions,
|
||||
showRelativeDates: uiSettings.showRelativeDates,
|
||||
shortDateFormat: uiSettings.shortDateFormat,
|
||||
longDateFormat: uiSettings.longDateFormat,
|
||||
timeFormat: uiSettings.timeFormat,
|
||||
isSmallScreen: dimensions.isSmallScreen,
|
||||
...artist
|
||||
isSmallScreen: dimensions.isSmallScreen
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
||||
import createUISettingsSelector from 'Store/Selectors/createUISettingsSelector';
|
||||
import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
|
||||
import ArtistIndexPosters from './ArtistIndexPosters';
|
||||
|
@ -8,17 +7,15 @@ import ArtistIndexPosters from './ArtistIndexPosters';
|
|||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.artistIndex.posterOptions,
|
||||
createClientSideCollectionSelector('artist', 'artistIndex'),
|
||||
createUISettingsSelector(),
|
||||
createDimensionsSelector(),
|
||||
(posterOptions, artist, uiSettings, dimensions) => {
|
||||
(posterOptions, uiSettings, dimensions) => {
|
||||
return {
|
||||
posterOptions,
|
||||
showRelativeDates: uiSettings.showRelativeDates,
|
||||
shortDateFormat: uiSettings.shortDateFormat,
|
||||
timeFormat: uiSettings.timeFormat,
|
||||
isSmallScreen: dimensions.isSmallScreen,
|
||||
...artist
|
||||
isSmallScreen: dimensions.isSmallScreen
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
|
@ -1,18 +1,18 @@
|
|||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import createClientSideCollectionSelector from 'Store/Selectors/createClientSideCollectionSelector';
|
||||
import { setArtistSort } from 'Store/Actions/artistIndexActions';
|
||||
import ArtistIndexTable from './ArtistIndexTable';
|
||||
|
||||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.app.dimensions,
|
||||
createClientSideCollectionSelector('artist', 'artistIndex'),
|
||||
(dimensions, artist) => {
|
||||
(state) => state.artistIndex.tableOptions,
|
||||
(state) => state.artistIndex.columns,
|
||||
(dimensions, tableOptions, columns) => {
|
||||
return {
|
||||
isSmallScreen: dimensions.isSmallScreen,
|
||||
...artist,
|
||||
showBanners: artist.tableOptions.showBanners
|
||||
showBanners: tableOptions.showBanners,
|
||||
columns
|
||||
};
|
||||
}
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue