From 87e4311d40fd241349e48f4ca27a39d36ec35f11 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Tue, 14 Mar 2017 08:00:39 +1300
Subject: [PATCH] History columns; Notify when added URIs to queue

---
 src/js/components/Modal/AddToQueueModal.js |  2 +-
 src/js/components/Modal/EditRadioModal.js  |  2 +-
 src/js/components/Track.js                 |  3 +++
 src/js/components/TrackList.js             |  1 +
 src/js/services/mopidy/middleware.js       | 14 +++++++++-----
 src/js/views/QueueHistory.js               |  2 +-
 src/scss/components/_lists.scss            |  5 +++--
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/js/components/Modal/AddToQueueModal.js b/src/js/components/Modal/AddToQueueModal.js
index 49c5e300..1780d7fb 100755
--- a/src/js/components/Modal/AddToQueueModal.js
+++ b/src/js/components/Modal/AddToQueueModal.js
@@ -34,7 +34,7 @@ export default class AddToQueueModal extends React.Component{
 					<div className="field text">
 						<input 
 							type="text"
-							placeholder="Add comma-separated URIs"
+							placeholder="Comma-separated URIs"
 							onChange={e => this.setState({uris: e.target.value})} 
 							value={this.state.uris} />
 					</div>
diff --git a/src/js/components/Modal/EditRadioModal.js b/src/js/components/Modal/EditRadioModal.js
index cab81b9f..1b60aab0 100755
--- a/src/js/components/Modal/EditRadioModal.js
+++ b/src/js/components/Modal/EditRadioModal.js
@@ -120,7 +120,7 @@ export default class EditRadioModal extends React.Component{
 			<div className="field no-top-margin">
 				<input 
 					type="text"
-					placeholder="Add comma-separated URIs"
+					placeholder="Comma-separated URIs"
 					onChange={e => this.setState({uri: e.target.value})} 
 					value={this.state.uri} />
 				<button type="button" className="discrete" onClick={e => this.addSeed()}><FontAwesome name="plus" /></button>
diff --git a/src/js/components/Track.js b/src/js/components/Track.js
index 4a186a3f..8730e184 100755
--- a/src/js/components/Track.js
+++ b/src/js/components/Track.js
@@ -64,6 +64,9 @@ export default class Track extends React.Component{
 					<span className="col name">
 						{ track.name ? track.name : <span className="grey-text">{track.uri}</span> }
 					</span>
+					<span className="col source">
+						{helpers.uriSource(track.uri)}
+					</span>
 					<span className="col played_at">
 						{ track.played_at ? <span><Dater type="ago" data={track.played_at} /> ago</span> : null }
 					</span>
diff --git a/src/js/components/TrackList.js b/src/js/components/TrackList.js
index 189f0e80..1228ee2f 100755
--- a/src/js/components/TrackList.js
+++ b/src/js/components/TrackList.js
@@ -257,6 +257,7 @@ class TrackList extends React.Component{
 				return (
 					<div className="list-item header track">
 						<span className="col name">Name</span>
+						<span className="col source">Source</span>
 						<span className="col played_at">Started playing</span>
 					</div>
 				)
diff --git a/src/js/services/mopidy/middleware.js b/src/js/services/mopidy/middleware.js
index d683edca..3ec3cdce 100755
--- a/src/js/services/mopidy/middleware.js
+++ b/src/js/services/mopidy/middleware.js
@@ -230,6 +230,7 @@ const MopidyMiddleware = (function(){
                             tlids.push(response[i].tlid)
                         }
                         store.dispatch( pusherActions.addQueueMetadata(tlids, action.from_uri) )
+                        store.dispatch( uiActions.createNotification('Added '+tlids.length+' URI(s) to queue') )
                     })
                 break
 
@@ -258,6 +259,7 @@ const MopidyMiddleware = (function(){
                             tlids.push(response[i].tlid)
                         }
                         store.dispatch( pusherActions.addQueueMetadata(tlids, action.from_uri) )
+                        store.dispatch( uiActions.createNotification('Added '+tlids.length+' URI(s) to queue') )
                     })
                 break
 
@@ -272,8 +274,10 @@ const MopidyMiddleware = (function(){
                 instruct( socket, store, 'tracklist.add', { uri: action.uris[0], at_position: 0 } )
                     .then( response => {
 
+                        // treat empty response as a failed lookup
                         if( !response || response.length <= 0 ){
                             store.dispatch( uiActions.createNotification('Failed to load URI(s)', 'bad') )
+
                         }else{
                             // play it
                             store.dispatch( mopidyActions.changeTrack( response[0].tlid ) );
@@ -283,12 +287,12 @@ const MopidyMiddleware = (function(){
                                 tlids.push(response[i].tlid)
                             }
                             store.dispatch( pusherActions.addQueueMetadata(tlids, action.from_uri) )
-                        }
 
-                        // add the rest of our uris (if any)
-                        action.uris.shift();
-                        if( action.uris.length > 0 ){
-                            store.dispatch( mopidyActions.enqueueURIs( action.uris, action.from_uri, 1 ) )
+                            // add the rest of our uris (if any)
+                            action.uris.shift();
+                            if( action.uris.length > 0 ){
+                                store.dispatch( mopidyActions.enqueueURIs( action.uris, action.from_uri, 1 ) )
+                            }
                         }
                     })
                 break;
diff --git a/src/js/views/QueueHistory.js b/src/js/views/QueueHistory.js
index a0dd4e5a..e7a1f58c 100755
--- a/src/js/views/QueueHistory.js
+++ b/src/js/views/QueueHistory.js
@@ -52,7 +52,7 @@ class QueueHistory extends React.Component{
 
 				<section className="list-wrapper">
 					<TrackList
-						className="queue-history-list"
+						className="queue-history-track-list"
 						show_source_icon={true}
 						context="history"
 						tracks={this.props.queue_history} />
diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss
index 77048471..af8ed34d 100755
--- a/src/scss/components/_lists.scss
+++ b/src/scss/components/_lists.scss
@@ -147,12 +147,13 @@
 		}
 	}
 
-	&.queue-history-track-list {
+	&.queue-history-track-list .list-item {
 		.col {
 			&.name { 
 				width: 60%;
 			}
-			&.played_at {
+			&.played_at,
+			&.source {
 				width: 20%;
 			}
 		}