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

Filtering artist albums by type; fixes #269

Browse Source
This commit is contained in:
James Barnsley
2018-06-09 11:07:51 +12:00
parent 07dd021047
commit 31a5577d5c
3 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
mopidy_iris/static/app.js
View File

@ -63850,6 +63850,11 @@ var Artist = function (_React$Component) {
};
this.props.uiActions.set(data);
}
}, {
key: 'setFilter',
value: function setFilter(value) {
this.props.uiActions.set({ artist_albums_filter: value });
}
}, {
key: 'renderSubViewMenu',
value: function renderSubViewMenu() {
@ -63911,6 +63916,10 @@ var Artist = function (_React$Component) {
}
}
albums = helpers.sortItems(albums, this.props.sort, this.props.sort_reverse);
if (this.props.filter) {
albums = helpers.applyFilter('album_type', this.props.filter, albums);
}
}
switch (this.props.params.sub_view) {
@ -64026,6 +64035,20 @@ var Artist = function (_React$Component) {
label: 'Tracks'
}];
var filter_options = [{
value: null,
label: 'All'
}, {
value: 'album',
label: 'Albums'
}, {
value: 'single',
label: 'Singles'
}, {
value: 'compilation',
label: 'Compilations'
}];
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks) {
for (var i = 0; i < this.props.artist.tracks_uris.length; i++) {
@ -64087,16 +64110,26 @@ var Artist = function (_React$Component) {
_react2.default.createElement(
'h4',
null,
'Albums',
'Releases',
_react2.default.createElement(_DropdownField2.default, {
icon: 'sort',
name: 'Sort',
value: this.props.sort,
options: sort_options,
selected_icon: this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down',
handleChange: function handleChange(val) {
_this2.setSort(val);_this2.props.uiActions.hideContextMenu();
} })
handleChange: function handleChange(value) {
_this2.setSort(value);_this2.props.uiActions.hideContextMenu();
}
}),
_react2.default.createElement(_DropdownField2.default, {
icon: 'filter_list',
name: 'Filter',
value: this.props.filter,
options: filter_options,
handleChange: function handleChange(value) {
_this2.setFilter(value);_this2.props.uiActions.hideContextMenu();
}
})
),
_react2.default.createElement(
'section',
@ -64205,6 +64238,7 @@ var mapStateToProps = function mapStateToProps(state, ownProps) {
spotify_library_artists: state.spotify.library_artists,
local_library_artists: state.mopidy.library_artists,
albums: state.core.albums ? state.core.albums : [],
filter: state.ui.artist_albums_filter ? state.ui.artist_albums_filter : null,
sort: state.ui.artist_albums_sort ? state.ui.artist_albums_sort : 'name',
sort_reverse: state.ui.artist_albums_sort_reverse ? true : false,
spotify_authorized: state.spotify.authorization,

2
mopidy_iris/static/app.js.map
View File

File diff suppressed because one or more lines are too long

40
src/js/views/Artist.js
View File

@ -105,6 +105,10 @@ class Artist extends React.Component{
this.props.uiActions.set(data)
}
setFilter(value){
this.props.uiActions.set({artist_albums_filter: value});
}
renderSubViewMenu(){
return (
<div className="sub-views">
@ -137,6 +141,10 @@ class Artist extends React.Component{
}
}
albums = helpers.sortItems(albums, this.props.sort, this.props.sort_reverse);
if (this.props.filter){
albums = helpers.applyFilter('album_type', this.props.filter, albums);
}
}
switch (this.props.params.sub_view){
@ -189,6 +197,25 @@ class Artist extends React.Component{
}
];
var filter_options = [
{
value: null,
label: 'All'
},
{
value: 'album',
label: 'Albums'
},
{
value: 'single',
label: 'Singles'
},
{
value: 'compilation',
label: 'Compilations'
}
];
var tracks = [];
if (this.props.artist.tracks_uris && this.props.tracks){
for (var i = 0; i < this.props.artist.tracks_uris.length; i++){
@ -223,14 +250,22 @@ class Artist extends React.Component{
<div className="albums">
<h4>
Albums
Releases
<DropdownField
icon="sort"
name="Sort"
value={this.props.sort}
options={sort_options}
selected_icon={this.props.sort_reverse ? 'keyboard_arrow_up' : 'keyboard_arrow_down'}
handleChange={val => {this.setSort(val); this.props.uiActions.hideContextMenu() }} />
handleChange={value => {this.setSort(value); this.props.uiActions.hideContextMenu() }}
/>
<DropdownField
icon="filter_list"
name="Filter"
value={this.props.filter}
options={filter_options}
handleChange={value => {this.setFilter(value); this.props.uiActions.hideContextMenu() }}
/>
</h4>
<section className="grid-wrapper no-top-padding">
@ -314,6 +349,7 @@ const mapStateToProps = (state, ownProps) => {
spotify_library_artists: state.spotify.library_artists,
local_library_artists: state.mopidy.library_artists,
albums: (state.core.albums ? state.core.albums : []),
filter: (state.ui.artist_albums_filter ? state.ui.artist_albums_filter : null),
sort: (state.ui.artist_albums_sort ? state.ui.artist_albums_sort : 'name'),
sort_reverse: (state.ui.artist_albums_sort_reverse ? true : false),
spotify_authorized: state.spotify.authorization,