fix(archive): Addressing PR feedback

* Remove try/catch * Add test for comparing to null values in the sort
box · Jan 17, 2020 · 113ff01 · 113ff01
1 parent e8755db
commit 113ff01
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/src/lib/viewers/archive/ArchiveExplorer.js b/src/lib/viewers/archive/ArchiveExplorer.js
@@ -167,23 +167,17 @@ class ArchiveExplorer extends React.Component {
             return itemList;
         }
 
-        let sortedItems;
+        const sortedItems = itemList.sort((a = {}, b = {}) => {
+            if (!a[sortBy] || !b[sortBy]) {
+                return -1;
+            }
 
-        try {
-            sortedItems = itemList.sort((a = {}, b = {}) => {
-                if (!a[sortBy] || !b[sortBy]) {
-                    return -1;
-                }
+            if (typeof a[sortBy] === 'number' && typeof b[sortBy] === 'number') {
+                return a[sortBy] - 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 a[sortBy].localeCompare(b[sortBy]);
+        });
 
         return sortDirection === SortDirection.ASC ? sortedItems : sortedItems.reverse();
     }

diff --git a/src/lib/viewers/archive/__tests__/ArchiveExplorer-test-react.js b/src/lib/viewers/archive/__tests__/ArchiveExplorer-test-react.js
@@ -219,5 +219,20 @@ describe('lib/viewers/archive/ArchiveExplorer', () => {
 
             expect(sortedList[0]).to.equal(itemList[0]);
         });
+
+        it('should sort item list with null values', () => {
+            data[1].modified_at = null;
+            data[2].modified_at = null;
+
+            const component = getComponent({ filename, itemCollection: data });
+            const instance = component.instance();
+            const itemList = instance.getItemList(data, 'test/');
+
+            instance.handleSort({ sortBy: 'modified_at' });
+
+            const sortedList = instance.sortItemList(itemList);
+
+            expect(sortedList[0]).to.equal(itemList[0]);
+        });
     });
 });