From c455a9da3f0265e1fb16a714fdcda8de912c82ee Mon Sep 17 00:00:00 2001
From: dannyrb <danny.ri.brown@gmail.com>
Date: Wed, 13 May 2020 00:31:30 -0400
Subject: [PATCH] Pass through for setting filter values so we can reset
 appropriate related fields when it changes

---
 .../routes/StudyListContainer/StudyListContainer.jsx   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
index dfeb957e4..3cc3b634c 100644
--- a/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
+++ b/platform/viewer/src/routes/StudyListContainer/StudyListContainer.jsx
@@ -29,7 +29,7 @@ function StudyListContainer({ history, data: studies, dataSource }) {
   // ~ Filters
   const query = useQuery();
   const queryFilterValues = _getQueryFilterValues(query);
-  const [filterValues, setFilterValues] = useState(
+  const [filterValues, _setFilterValues] = useState(
     Object.assign({}, defaultFilterValues, queryFilterValues)
   );
   const debouncedFilterValues = useDebounce(filterValues, 200);
@@ -40,6 +40,14 @@ function StudyListContainer({ history, data: studies, dataSource }) {
   const numOfStudies = studies.length;
   const totalPages = Math.floor(numOfStudies / resultsPerPage);
 
+  const setFilterValues = val => {
+    if (filterValues.pageNumber === val.pageNumber) {
+      val.pageNumber = 1;
+    }
+    _setFilterValues(val);
+    setExpandedRows([]);
+  };
+
   const onPageNumberChange = newPageNumber => {
     if (newPageNumber > totalPages) {
       return;