Fix unhandled exception thrown when invalid datetime ranges are provi…

…ded in download status table Thanks to @kaperoo for finding this one!
ral-facilities · Aug 23, 2023 · 0ff8da5 · 0ff8da5
1 parent f4ff158
commit 0ff8da5
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/packages/datagateway-download/src/downloadStatus/downloadStatusTable.component.test.tsx b/packages/datagateway-download/src/downloadStatus/downloadStatusTable.component.test.tsx
@@ -361,6 +361,19 @@ describe('Download Status Table', () => {
     expect(screen.queryByText('test-file-4')).toBeNull();
     expect(screen.queryByText('test-file-5')).toBeNull();
 
+    // create an invalid range
+    await user.type(dateFromFilterInput, '2020-02-28 00:00:00');
+
+    // should display error
+    expect(await screen.findAllByText('Invalid date-time range'));
+
+    // Should show all files
+    expect(await screen.findByText('test-file-1')).toBeInTheDocument();
+    expect(await screen.findByText('test-file-2')).toBeInTheDocument();
+    expect(await screen.findByText('test-file-3')).toBeInTheDocument();
+    expect(await screen.findByText('test-file-4')).toBeInTheDocument();
+    expect(await screen.findByText('test-file-5')).toBeInTheDocument();
+
     cleanupDatePickerWorkaround();
   });
 

diff --git a/packages/datagateway-download/src/downloadStatus/downloadStatusTable.component.tsx b/packages/datagateway-download/src/downloadStatus/downloadStatusTable.component.tsx
@@ -191,12 +191,22 @@ const DownloadStatusTable: React.FC<DownloadStatusTableProps> = (
           const endDateFilter = filter.endDate ? toDate(filter.endDate) : null;
 
           if (startDateFilter && endDateFilter) {
-            satisfiedFilters.push(
-              isWithinInterval(tableDate, {
-                start: startDateFilter,
-                end: endDateFilter,
-              })
-            );
+            try {
+              satisfiedFilters.push(
+                isWithinInterval(tableDate, {
+                  start: startDateFilter,
+                  end: endDateFilter,
+                })
+              );
+            } catch (e) {
+              if (e instanceof RangeError) {
+                // isWithinInterval throws with RangeError if startDate > endDate
+                // in the date filter we tell the user this is invalid,
+                // so handle it there and do nothing here
+              } else {
+                throw e;
+              }
+            }
 
             continue;
           }