secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merging with upstream

Browse Source
This commit is contained in:
James Barnsley
2018-06-26 20:42:18 +12:00
parent 403d348d2f 1300ae4188
commit ca7e0fc40a
17 changed files with 211 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/views/library/LibraryArtists.js
View File

@ -122,7 +122,9 @@ class LibraryArtists extends React.Component{
}
}
artists = helpers.sortItems(artists, this.props.sort, this.props.sort_reverse)
if (this.props.sort){
artists = helpers.sortItems(artists, this.props.sort, this.props.sort_reverse);
}
if (this.state.filter !== ''){
artists = helpers.applyFilter('name', this.state.filter, artists)
@ -201,6 +203,10 @@ class LibraryArtists extends React.Component{
];
var sort_options = [
{
label: 'Default',
value: null
},
{
label: 'Name',
value: 'name'
@ -223,7 +229,7 @@ class LibraryArtists extends React.Component{
name="Sort"
value={this.props.sort}
options={sort_options}
selected_icon={this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down'}
selected_icon={this.props.sort ? (this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down') : null}
handleChange={value => {this.setSort(value); this.props.uiActions.hideContextMenu() }}
/>
<DropdownField
@ -272,8 +278,8 @@ const mapStateToProps = (state, ownProps) => {
spotify_library_artists_status: (state.ui.processes.SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR !== undefined ? state.ui.processes.SPOTIFY_GET_LIBRARY_ARTISTS_PROCESSOR.status : null),
artists: state.core.artists,
source: (state.ui.library_artists_source ? state.ui.library_artists_source : 'all'),
sort: (state.ui.library_artists_sort ? state.ui.library_artists_sort : 'name'),
sort_reverse: (state.ui.library_artists_sort_reverse ? true : false),
sort: (state.ui.library_artists_sort ? state.ui.library_artists_sort : null),
sort_reverse: (state.ui.library_artists_sort_reverse ? state.ui.library_artists_sort_reverse : false),
view: state.ui.library_artists_view
}
}