From adc47c51e04508055796d3db7239b86178872c73 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Sun, 13 Dec 2020 21:18:48 -0500
Subject: [PATCH] Fixed: Size on disk sorting and display

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
---
 frontend/src/Album/Details/AlbumDetails.js       |  2 +-
 frontend/src/Artist/Details/ArtistDetails.js     |  2 +-
 frontend/src/Store/Actions/artistActions.js      | 10 +++++++++-
 frontend/src/Store/Actions/artistIndexActions.js |  6 ------
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/Album/Details/AlbumDetails.js b/frontend/src/Album/Details/AlbumDetails.js
index 4ef9cba12..ac4c52ab6 100644
--- a/frontend/src/Album/Details/AlbumDetails.js
+++ b/frontend/src/Album/Details/AlbumDetails.js
@@ -416,7 +416,7 @@ class AlbumDetails extends Component {
 
                     <span className={styles.sizeOnDisk}>
                       {
-                        formatBytes(statistics.sizeOnDisk)
+                        formatBytes(statistics.sizeOnDisk || 0)
                       }
                     </span>
                   </Label>
diff --git a/frontend/src/Artist/Details/ArtistDetails.js b/frontend/src/Artist/Details/ArtistDetails.js
index c253c30db..9fd6e4ae0 100644
--- a/frontend/src/Artist/Details/ArtistDetails.js
+++ b/frontend/src/Artist/Details/ArtistDetails.js
@@ -460,7 +460,7 @@ class ArtistDetails extends Component {
 
                     <span className={styles.sizeOnDisk}>
                       {
-                        formatBytes(sizeOnDisk)
+                        formatBytes(sizeOnDisk || 0)
                       }
                     </span>
                   </Label>
diff --git a/frontend/src/Store/Actions/artistActions.js b/frontend/src/Store/Actions/artistActions.js
index b5a87f48b..b694ebfb5 100644
--- a/frontend/src/Store/Actions/artistActions.js
+++ b/frontend/src/Store/Actions/artistActions.js
@@ -114,7 +114,9 @@ export const filterPredicates = {
 
   sizeOnDisk: function(item, filterValue, type) {
     const predicate = filterTypePredicates[type];
-    const sizeOnDisk = item.statistics ? item.statistics.sizeOnDisk : 0;
+    const sizeOnDisk = item.statistics && item.statistics.sizeOnDisk ?
+      item.statistics.sizeOnDisk :
+      0;
 
     return predicate(sizeOnDisk, filterValue);
   }
@@ -133,6 +135,12 @@ export const sortPredicates = {
     }
 
     return result;
+  },
+
+  sizeOnDisk: function(item) {
+    const { statistics = {} } = item;
+
+    return statistics.sizeOnDisk || 0;
   }
 };
 
diff --git a/frontend/src/Store/Actions/artistIndexActions.js b/frontend/src/Store/Actions/artistIndexActions.js
index bc941b51f..741a2e0c8 100644
--- a/frontend/src/Store/Actions/artistIndexActions.js
+++ b/frontend/src/Store/Actions/artistIndexActions.js
@@ -207,12 +207,6 @@ export const defaultState = {
       return statistics.totalTrackCount || 0;
     },
 
-    sizeOnDisk: function(item) {
-      const { statistics = {} } = item;
-
-      return statistics.sizeOnDisk;
-    },
-
     ratings: function(item) {
       const { ratings = {} } = item;