From ef6a84c13638cfc24ab7bb2eda05e5040400519f Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sat, 3 Feb 2018 22:44:16 -0500
Subject: [PATCH] Fixed: Medium track status on AlbumDetails page.

---
 frontend/src/Album/Details/AlbumDetails.js         |  1 +
 frontend/src/Album/Details/AlbumDetailsMedium.js   | 14 +++++++++++---
 .../Album/Details/AlbumDetailsMediumConnector.js   |  1 +
 .../Interactive/InteractiveImportModalContent.js   |  3 ++-
 .../Track/SelectTrackModalContent.js               |  3 ++-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/src/Album/Details/AlbumDetails.js b/frontend/src/Album/Details/AlbumDetails.js
index 4b6131a0e..bedc98047 100644
--- a/frontend/src/Album/Details/AlbumDetails.js
+++ b/frontend/src/Album/Details/AlbumDetails.js
@@ -369,6 +369,7 @@ class AlbumDetails extends Component {
                         <AlbumDetailsMediumConnector
                           key={medium.mediumNumber}
                           albumId={id}
+                          albumMonitored={monitored}
                           {...medium}
                           isExpanded={expandedState[medium.mediumNumber]}
                           onExpandPress={this.onExpandPress}
diff --git a/frontend/src/Album/Details/AlbumDetailsMedium.js b/frontend/src/Album/Details/AlbumDetailsMedium.js
index 0a3d9c242..2ba6bb975 100644
--- a/frontend/src/Album/Details/AlbumDetailsMedium.js
+++ b/frontend/src/Album/Details/AlbumDetailsMedium.js
@@ -22,6 +22,8 @@ function getMediumStatistics(tracks) {
     if (track.trackFileId) {
       trackCount++;
       trackFileCount++;
+    } else if (track.monitored) {
+      trackCount++;
     }
 
     totalTrackCount++;
@@ -34,11 +36,15 @@ function getMediumStatistics(tracks) {
   };
 }
 
-function getTrackCountKind(trackFileCount, trackCount) {
+function getTrackCountKind(monitored, trackFileCount, trackCount) {
   if (trackFileCount === trackCount && trackCount > 0) {
     return kinds.SUCCESS;
   }
 
+  if (!monitored) {
+    return kinds.WARNING;
+  }
+
   return kinds.DANGER;
 }
 
@@ -94,6 +100,7 @@ class AlbumDetailsMedium extends Component {
     const {
       mediumNumber,
       mediumFormat,
+      albumMonitored,
       items,
       columns,
       onTableOptionChange,
@@ -123,11 +130,11 @@ class AlbumDetailsMedium extends Component {
 
             <Label
               title={`${totalTrackCount} tracks total. ${trackFileCount} tracks with files.`}
-              kind={getTrackCountKind(trackFileCount, trackCount)}
+              kind={getTrackCountKind(albumMonitored, trackFileCount, trackCount)}
               size={sizes.LARGE}
             >
               {
-                <span>{totalTrackCount} / {trackCount}</span>
+                <span>{trackFileCount} / {trackCount}</span>
               }
             </Label>
           </div>
@@ -197,6 +204,7 @@ class AlbumDetailsMedium extends Component {
 
 AlbumDetailsMedium.propTypes = {
   albumId: PropTypes.number.isRequired,
+  albumMonitored: PropTypes.bool.isRequired,
   mediumNumber: PropTypes.number.isRequired,
   mediumFormat: PropTypes.string.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/frontend/src/Album/Details/AlbumDetailsMediumConnector.js b/frontend/src/Album/Details/AlbumDetailsMediumConnector.js
index 32010a224..e05d9870d 100644
--- a/frontend/src/Album/Details/AlbumDetailsMediumConnector.js
+++ b/frontend/src/Album/Details/AlbumDetailsMediumConnector.js
@@ -56,6 +56,7 @@ class AlbumDetailsMediumConnector extends Component {
 
 AlbumDetailsMediumConnector.propTypes = {
   albumId: PropTypes.number.isRequired,
+  albumMonitored: PropTypes.bool.isRequired,
   mediumNumber: PropTypes.number.isRequired,
   setTracksTableOption: PropTypes.func.isRequired,
   executeCommand: PropTypes.func.isRequired
diff --git a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
index f24fc9250..9469c35f5 100644
--- a/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
+++ b/frontend/src/InteractiveImport/Interactive/InteractiveImportModalContent.js
@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
@@ -195,7 +196,7 @@ class InteractiveImportModalContent extends Component {
 
     const selectedIds = this.getSelectedIds();
     const selectedItem = selectedIds.length ? _.find(items, { id: selectedIds[0] }) : null;
-    const errorMessage = error && error.message || 'Unable to load manual import items';
+    const errorMessage = getErrorMessage(error, 'Unable to load manual import items');
 
     const importModeOptions = [
       { key: 'move', value: 'Move Files' },
diff --git a/frontend/src/InteractiveImport/Track/SelectTrackModalContent.js b/frontend/src/InteractiveImport/Track/SelectTrackModalContent.js
index 06e792cf3..eda1e2bfb 100644
--- a/frontend/src/InteractiveImport/Track/SelectTrackModalContent.js
+++ b/frontend/src/InteractiveImport/Track/SelectTrackModalContent.js
@@ -1,5 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
+import getErrorMessage from 'Utilities/Object/getErrorMessage';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
@@ -95,7 +96,7 @@ class SelectTrackModalContent extends Component {
       selectedState
     } = this.state;
 
-    const errorMessage = error && error.message || 'Unable to load tracks';
+    const errorMessage = getErrorMessage(error, 'Unable to load tracks');
 
     return (
       <ModalContent onModalClose={onModalClose}>