From c712d932a0a5621b24910e804f6ceb5cfbc88f85 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 4 Feb 2018 00:53:03 -0500
Subject: [PATCH] Fixed: Queue sort keys

Closes #194
---
 frontend/src/Activity/History/HistoryRow.js  |  2 +-
 frontend/src/Activity/Queue/QueueRow.js      |  2 +-
 frontend/src/Store/Actions/historyActions.js |  3 ++-
 frontend/src/Store/Actions/queueActions.js   |  3 ++-
 src/Lidarr.Api.V1/Queue/QueueModule.cs       | 10 +++++-----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js
index c98027496..715851b7e 100644
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -108,7 +108,7 @@ class HistoryRow extends Component {
               );
             }
 
-            if (name === 'albumTitle') {
+            if (name === 'album.title') {
               return (
                 <TableRowCell key={name}>
                   <AlbumTitleLink
diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js
index cb34d6796..5d5e9dbd2 100644
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -152,7 +152,7 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'albumTitle') {
+            if (name === 'album.title') {
               return (
                 <TableRowCell key={name}>
                   <AlbumTitleLink
diff --git a/frontend/src/Store/Actions/historyActions.js b/frontend/src/Store/Actions/historyActions.js
index f334fea1c..329607f78 100644
--- a/frontend/src/Store/Actions/historyActions.js
+++ b/frontend/src/Store/Actions/historyActions.js
@@ -42,8 +42,9 @@ export const defaultState = {
       isVisible: true
     },
     {
-      name: 'albumTitle',
+      name: 'album.title',
       label: 'Album Title',
+      isSortable: true,
       isVisible: true
     },
     {
diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js
index 8d06dba39..54df00ae5 100644
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -64,8 +64,9 @@ export const defaultState = {
         isVisible: true
       },
       {
-        name: 'albumTitle',
+        name: 'album.title',
         label: 'Album Title',
+        isSortable: true,
         isVisible: true
       },
       {
diff --git a/src/Lidarr.Api.V1/Queue/QueueModule.cs b/src/Lidarr.Api.V1/Queue/QueueModule.cs
index 30600b40b..1cf65945f 100644
--- a/src/Lidarr.Api.V1/Queue/QueueModule.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueModule.cs
@@ -80,11 +80,11 @@ namespace Lidarr.Api.V1.Queue
         {
             switch (pagingSpec.SortKey)
             {
-                case "series.sortTitle":
+                case "artist.sortName":
                     return q => q.Artist.SortName;
-                case "episode":
+                case "album":
                     return q => q.Album;
-                case "episode.title":
+                case "album.title":
                     return q => q.Album.Title;
                 case "quality":
                     return q => q.Quality;
@@ -95,9 +95,9 @@ namespace Lidarr.Api.V1.Queue
             }
         }
 
-        private QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeSeries, bool includeEpisode)
+        private QueueResource MapToResource(NzbDrone.Core.Queue.Queue queueItem, bool includeArtist, bool includeAlbum)
         {
-            return queueItem.ToResource(includeSeries, includeEpisode);
+            return queueItem.ToResource(includeArtist, includeAlbum);
         }
 
         public void Handle(QueueUpdatedEvent message)