[UI Work] History, Queue, Calendar Fixes

frontend/src/Activity/Queue/Queue.js

@@ -100,7 +100,7 @@ class Queue extends Component {
       isPopulated,
       error,
       items,
-      isEpisodesPopulated,
+      isAlbumsPopulated,
       columns,
       totalRecords,
       isGrabbing,
@@ -119,7 +119,7 @@ class Queue extends Component {
     } = this.state;
 
     const isRefreshing = isFetching || isCheckForFinishedDownloadExecuting;
-    const isAllPopulated = isPopulated && (isEpisodesPopulated || !items.length);
+    const isAllPopulated = isPopulated && (isAlbumsPopulated || !items.length);
     const selectedCount = this.getSelectedIds().length;
     const disableSelectedActions = selectedCount === 0;
 
@@ -191,7 +191,7 @@ class Queue extends Component {
                         return (
                           <QueueRowConnector
                             key={item.id}
-                            episodeId={item.episode.id}
+                            episodeId={item.album.id}
                             episodeEntity={episodeEntities.QUEUE_EPISODES}
                             isSelected={selectedState[item.id]}
                             columns={columns}
@@ -229,7 +229,7 @@ Queue.propTypes = {
   isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  isEpisodesPopulated: PropTypes.bool.isRequired,
+  isAlbumsPopulated: PropTypes.bool.isRequired,
   columns: PropTypes.arrayOf(PropTypes.object).isRequired,
   totalRecords: PropTypes.number,
   isGrabbing: PropTypes.bool.isRequired,

frontend/src/Activity/Queue/QueueConnector.js

@@ -21,7 +21,7 @@ function createMapStateToProps() {
 
       return {
         isCheckForFinishedDownloadExecuting,
-        isEpisodesPopulated: queueEpisodes.isPopulated,
+        isAlbumsPopulated: queueEpisodes.isPopulated,
         ...queue
       };
     }
@@ -46,7 +46,7 @@ class QueueConnector extends Component {
   componentDidUpdate(prevProps) {
     if (hasDifferentItems(prevProps.items, this.props.items)) {
       const episodes = _.uniqBy(_.reduce(this.props.items, (result, item) => {
-        result.push(item.episode);
+        result.push(item.album);
 
         return result;
       }, []), ({ id }) => id);

frontend/src/Activity/Queue/QueueRow.js

@@ -132,12 +132,12 @@ class QueueRow extends Component {
               );
             }
 
-            if (name === 'series.sortTitle') {
+            if (name === 'series.sortName') {
               return (
                 <TableRowCell key={name}>
                   <ArtistNameLink
-                    titleSlug={series.titleSlug}
-                    title={series.title}
+                    nameSlug={series.nameSlug}
+                    artistName={series.artistName}
                   />
                 </TableRowCell>
               );
@@ -147,24 +147,8 @@ class QueueRow extends Component {
               return (
                 <TableRowCell key={name}>
                   <ArtistNameLink
-                    titleSlug={series.titleSlug}
-                    title={series.title}
-                  />
-                </TableRowCell>
-              );
-            }
-
-            if (name === 'episode') {
-              return (
-                <TableRowCell key={name}>
-                  <SeasonEpisodeNumber
-                    seasonNumber={episode.seasonNumber}
-                    episodeNumber={episode.episodeNumber}
-                    absoluteEpisodeNumber={episode.absoluteEpisodeNumber}
-                    seriesType={series.seriesType}
-                    sceneSeasonNumber={episode.sceneSeasonNumber}
-                    sceneEpisodeNumber={episode.sceneEpisodeNumber}
-                    sceneAbsoluteEpisodeNumber={episode.sceneAbsoluteEpisodeNumber}
+                    nameSlug={series.nameSlug}
+                    artistName={series.artistName}
                   />
                 </TableRowCell>
               );
@@ -316,7 +300,7 @@ QueueRow.propTypes = {
   status: PropTypes.string.isRequired,
   trackedDownloadStatus: PropTypes.string,
   statusMessages: PropTypes.arrayOf(PropTypes.object),
-  errorMessage: PropTypes.string.isRequired,
+  errorMessage: PropTypes.string,
   series: PropTypes.object.isRequired,
   episode: PropTypes.object.isRequired,
   quality: PropTypes.object.isRequired,