fix(archive): Fix blank screen when sorting

* Add try/catch handler for exceptions * Handle case when sorting data is falsy
box · Jan 16, 2020 · 3e0a5ec · 3e0a5ec
1 parent a23deeb
commit 3e0a5ec
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/lib/viewers/archive/ArchiveExplorer.js b/src/lib/viewers/archive/ArchiveExplorer.js
@@ -162,18 +162,27 @@ class ArchiveExplorer extends React.Component {
      */
     sortItemList(itemList) {
         const { sortBy, sortDirection } = this.state;
+        let sortedItems;
 
         if (!sortBy.length) {
             return itemList;
         }
 
-        const sortedItems = itemList.sort((a, b) => {
-            if (typeof a[sortBy] === 'number' && typeof b[sortBy] === 'number') {
-                return a[sortBy] - b[sortBy];
-            }
+        try {
+            sortedItems = itemList.sort((a, b) => {
+                if (!a[sortBy] || !b[sortBy]) {
+                    return -1;
+                }
 
-            return a[sortBy].localeCompare(b[sortBy]);
-        });
+                if (typeof a[sortBy] === 'number' && typeof b[sortBy] === 'number') {
+                    return a[sortBy] - b[sortBy];
+                }
+
+                return a[sortBy].localeCompare(b[sortBy]);
+            });
+        } catch {
+            sortedItems = itemList;
+        }
 
         return sortDirection === SortDirection.ASC ? sortedItems : sortedItems.reverse();
     }