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

Tracks loader; Me placeholder as undefined, fixes #650

Browse Source
This commit is contained in:
James Barnsley
2020-11-20 22:20:30 +13:00
parent 633ced05d7
commit e4c49a7f76
16 changed files with 145 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/views/Debug.js
View File

@ -186,7 +186,7 @@ class Debug extends React.Component {
onClick={
() => this.props.uiActions.startProcess(
'TEST_PROCESS',
{ content: 'Test process', remaining: 68, total: 100 },
{ content: 'Test process', remaining: 36, total: 100 },
)
}
tracking={{ category: 'Debug', action: 'Test process' }}

6
src/js/views/Playlist.js
View File

@ -325,6 +325,7 @@ class Playlist extends React.Component {
uri,
playlist,
loading,
loading_tracks,
slim_mode,
sort,
sort_reverse,
@ -438,6 +439,7 @@ class Playlist extends React.Component {
<h4 className="no-bottom-margin">
<I18n path="playlist.tracks.title" />
{loading_tracks && <Loader loading mini />}
<div className="actions-wrapper">
<FilterField
initialValue={filter}
@ -466,8 +468,6 @@ class Playlist extends React.Component {
reorderTracks={this.reorderTracks}
/>
</section>
{loading && <Loader body loading />}
</div>
);
}
@ -494,6 +494,7 @@ const mapStateToProps = (state, ownProps) => {
const playlistId = getFromUri('playlistid', uri);
const itemSelector = makeItemSelector(uri);
const loadingSelector = makeLoadingSelector([`(.*)${playlistId}(?!.*(following))(.*)`]);
const loadingTracksSelector = makeLoadingSelector([`(.*)${playlistId}/tracks(.*)`]);
return {
uri,
@ -501,6 +502,7 @@ const mapStateToProps = (state, ownProps) => {
slim_mode,
theme,
loading: loadingSelector(state),
loading_tracks: loadingTracksSelector(state),
playlist: itemSelector(state),
spotify_library_playlists,
local_library_playlists,