From fea7e55fe08a34b6ae920859595f1afa75f9e717 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Sun, 19 May 2019 11:57:08 +1200
Subject: [PATCH] Collating album object before sorting, fixes #379

---
 src/js/components/AlbumGrid.js        | 3 +--
 src/js/views/library/LibraryAlbums.js | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/js/components/AlbumGrid.js b/src/js/components/AlbumGrid.js
index 296a2b66..d4673462 100755
--- a/src/js/components/AlbumGrid.js
+++ b/src/js/components/AlbumGrid.js
@@ -37,8 +37,7 @@ class AlbumGrid extends React.Component{
 			return (
 				<div className={className}>
 					{
-						this.props.albums.map(item => {
-							var album = helpers.collate(item, {artists: this.props.artists});
+						this.props.albums.map(album => {
 							return (
 								<GridItem
 									key={album.uri}
diff --git a/src/js/views/library/LibraryAlbums.js b/src/js/views/library/LibraryAlbums.js
index 96dea1df..a11b0f5c 100755
--- a/src/js/views/library/LibraryAlbums.js
+++ b/src/js/views/library/LibraryAlbums.js
@@ -147,7 +147,7 @@ class LibraryAlbums extends React.Component{
 	}
 
 	renderView(){
-		var albums = []
+		var albums = [];
 
 		// Spotify library items
 		if (this.props.spotify_library_albums && (this.props.source == 'all' || this.props.source == 'spotify')){
@@ -197,6 +197,11 @@ class LibraryAlbums extends React.Component{
 			}
 		}
 
+		// Collate each album into it's full object (including nested artists)
+		for (let i = 0; i < albums.length; i++) {
+			albums[i] = helpers.collate(albums[i], {artists: this.props.artists});
+		}
+
 		if (this.props.sort){
 			albums = helpers.sortItems(albums, this.props.sort, this.props.sort_reverse);
 		}
@@ -355,6 +360,7 @@ const mapStateToProps = (state, ownProps) => {
 		mopidy_connected: state.mopidy.connected,
 		mopidy_uri_schemes: state.mopidy.uri_schemes,
 		load_queue: state.ui.load_queue,
+		artists: state.core.artists,
 		albums: state.core.albums,
 		mopidy_library_albums: state.mopidy.library_albums,
 		mopidy_library_albums_status: (state.ui.processes.MOPIDY_LIBRARY_ALBUMS_PROCESSOR !== undefined ? state.ui.processes.MOPIDY_LIBRARY_ALBUMS_PROCESSOR.status : null),