From 706e28a7b62ff0c1367832f397eea19a933d3bb3 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Wed, 16 Aug 2017 18:03:07 +1200
Subject: [PATCH] Resumable processes for mopidy

---
 src/js/services/mopidy/middleware.js   |  6 +++---
 src/js/views/Album.js                  |  2 +-
 src/js/views/Artist.js                 |  2 +-
 src/js/views/Playlist.js               |  2 +-
 src/js/views/Search.js                 |  2 +-
 src/scss/components/_filter-field.scss | 13 +++++++++++++
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index 87744dd4..178fbca6 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -351,8 +351,8 @@ const MopidyMiddleware = (function(){
                     for (var i = 0; i < batches.length; i++){
                         total_uris += batches[i].uris.length
                     }
-                    var next_batches = batches.shift()
-                    store.dispatch(uiActions.updateProcess('MOPIDY_ENQUEUE_URIS_PROCESSOR', 'Adding '+total_uris+' URI(s)', {batches: next_batches}))
+                    batches.shift()
+                    store.dispatch(uiActions.updateProcess('MOPIDY_ENQUEUE_URIS_PROCESSOR', 'Adding '+total_uris+' URI(s)'))
 
                 // no batches means we're done here
                 } else {
@@ -408,7 +408,7 @@ const MopidyMiddleware = (function(){
                         // locked until we're completely done.
                         setTimeout(
                             function(){
-                                store.dispatch(uiActions.runProcess(action.type))
+                                store.dispatch(uiActions.runProcess(action.type, {batches: batches}))
                             }, 
                             100
                         )
diff --git a/src/js/views/Album.js b/src/js/views/Album.js
index b21dd3b2..2c473b5f 100755
--- a/src/js/views/Album.js
+++ b/src/js/views/Album.js
@@ -151,7 +151,7 @@ class Album extends React.Component{
 
 				<section className="list-wrapper">
 					{ this.props.album.tracks ? <TrackList className="album-track-list" tracks={ this.props.album.tracks } uri={this.props.params.uri} /> : null }
-					<LazyLoadListener enabled={this.props.album.tracks_more} loadMore={ () => this.loadMore() }/>
+					<LazyLoadListener loading={this.props.album.tracks_more} loadMore={ () => this.loadMore() }/>
 				</section>
 
 			</div>
diff --git a/src/js/views/Artist.js b/src/js/views/Artist.js
index 5ef45b16..59f3fce8 100755
--- a/src/js/views/Artist.js
+++ b/src/js/views/Artist.js
@@ -179,7 +179,7 @@ class Artist extends React.Component{
 						<h4>Albums</h4>
 						<section className="grid-wrapper no-top-padding">
 							<AlbumGrid albums={albums} />
-							<LazyLoadListener enabled={this.props.artist.albums_more} loadMore={ () => this.loadMore() }/>
+							<LazyLoadListener loading={this.props.artist.albums_more} loadMore={ () => this.loadMore() }/>
 						</section>
 					</div>
 				)
diff --git a/src/js/views/Playlist.js b/src/js/views/Playlist.js
index aebb944e..face2fab 100755
--- a/src/js/views/Playlist.js
+++ b/src/js/views/Playlist.js
@@ -195,7 +195,7 @@ class Playlist extends React.Component{
 
 				<section className="list-wrapper">
 					{ this.props.playlist.tracks ? <TrackList uri={this.props.params.uri} className="playlist-track-list" context={context} tracks={this.props.playlist.tracks} removeTracks={ tracks_indexes => this.removeTracks(tracks_indexes) } reorderTracks={ (indexes, index) => this.reorderTracks(indexes, index) } /> : null }
-					<LazyLoadListener enabled={this.props.playlist.tracks_more} loadMore={ () => this.loadMore() }/>
+					<LazyLoadListener loading={this.props.playlist.tracks_more} loadMore={ () => this.loadMore() }/>
 				</section>
 			</div>
 		)
diff --git a/src/js/views/Search.js b/src/js/views/Search.js
index 3a596760..021df1f7 100755
--- a/src/js/views/Search.js
+++ b/src/js/views/Search.js
@@ -198,7 +198,7 @@ class Search extends React.Component{
 						<section className="list-wrapper">
 							<h4><Link to={global.baseURL+'search/'+this.props.params.query+'/tracks'}>Tracks</Link></h4>
 							<TrackList tracks={tracks} uri={'iris:search:'+this.props.params.type+':'+this.props.params.query} show_source_icon />
-							<LazyLoadListener enabled={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
+							<LazyLoadListener loading={this.props['tracks_more'] && spotify_search_enabled} loadMore={ () => this.loadMore('tracks') }/>
 						</section>
 
 					</div>
diff --git a/src/scss/components/_filter-field.scss b/src/scss/components/_filter-field.scss
index 02031c97..ac1413bf 100755
--- a/src/scss/components/_filter-field.scss
+++ b/src/scss/components/_filter-field.scss
@@ -19,6 +19,19 @@
 		background: transparent;
 	}
 
+	&:not(.active){
+		input {
+			cursor: pointer;
+		}
+		
+		&:hover {
+
+			.fa {
+				color: $blue;
+			}
+		}
+	}
+
 	&.active {
 		input {
 			width: 180px;