Destructuring of spotify.me.id, should fix #638 (unreproucable)

This commit is contained in:
James Barnsley
2020-11-11 20:50:31 +13:00
parent eb7901d626
commit 13c96665e9
5 changed files with 93 additions and 22 deletions

View File

@ -61,7 +61,7 @@ class QueueHistory extends React.Component {
<Icon name="play_arrow" type="material" />
</I18n>
</Header>
{tracks && (
{tracks.length > 0 && (
<section className="content-wrapper">
<TrackList
uri="iris:queue-history"

View File

@ -354,6 +354,13 @@ class LibraryPlaylists extends React.Component {
const mapStateToProps = (state) => {
const source = state.ui.library_playlists_source || 'all';
const {
spotify: {
me: {
id: me_id,
} = {},
},
} = state;
const libraryUris = [];
if (source === 'all' || source === 'local') libraryUris.push('mopidy:library:playlists');
@ -369,7 +376,7 @@ const mapStateToProps = (state) => {
playlists: librarySelector(state),
loading_progress: processProgressSelector(state),
source,
me_id: (state.spotify.me ? state.spotify.me.id : false),
me_id,
view: state.ui.library_playlists_view,
sort: (state.ui.library_playlists_sort ? state.ui.library_playlists_sort : null),
sort_reverse: (state.ui.library_playlists_sort_reverse ? state.ui.library_playlists_sort_reverse : false),

View File

@ -106,17 +106,39 @@ class AddToPlaylist extends React.Component {
}
}
const mapStateToProps = (state, ownProps) => ({
uris: (ownProps.match.params.uris ? decodeURIComponent(ownProps.match.params.uris).split(',') : []),
mopidy_uri_schemes: state.mopidy.uri_schemes,
items: state.core.items,
mopidy_library: state.core.libraries['mopidy:library:playlists'],
spotify_library: state.core.libraries['spotify:library:playlists'],
spotify_available: state.spotify.access_token,
load_queue: state.ui.load_queue,
me_id: (state.spotify.me ? state.spotify.me.id : false),
playlists: state.core.playlists,
});
const mapStateToProps = (state, ownProps) => {
const {
spotify: {
me: {
id: me_id,
} = {},
access_token: spotify_available,
},
ui: {
load_queue,
},
core: {
playlists,
items,
libraries,
},
mopidy: {
uri_schemes: mopidy_uri_schemes,
}
} = state;
return {
uris: (ownProps.match.params.uris ? decodeURIComponent(ownProps.match.params.uris).split(',') : []),
mopidy_uri_schemes,
items,
mopidy_library: libraries['mopidy:library:playlists'],
spotify_library: libraries['spotify:library:playlists'],
spotify_available,
load_queue,
me_id,
playlists,
};
};
const mapDispatchToProps = (dispatch) => ({
coreActions: bindActionCreators(coreActions, dispatch),

View File

@ -297,7 +297,7 @@ class ShareConfiguration extends React.Component {
}
}
const mapStateToProps = (state, ownProps) => ({
const mapStateToProps = (state) => ({
spotify_authorization: state.spotify.authorization,
spotify_me: state.spotify.me,
genius_authorization: state.genius.authorization,