From ddc432ee518a9201f04d8ea3715ae7d00583fa76 Mon Sep 17 00:00:00 2001
From: usodhi <61431818+usodhi@users.noreply.github.com>
Date: Tue, 6 Apr 2021 13:14:58 -0400
Subject: finished adding docrangefilters

---
 src/client/views/collections/CollectionSubView.tsx |  2 +-
 src/client/views/nodes/FilterBox.tsx               | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/client/views/collections/CollectionSubView.tsx b/src/client/views/collections/CollectionSubView.tsx
index 57e1a50bb..0c022eba3 100644
--- a/src/client/views/collections/CollectionSubView.tsx
+++ b/src/client/views/collections/CollectionSubView.tsx
@@ -82,7 +82,7 @@ export function CollectionSubView<T, X>(schemaCtor: (doc: Doc) => T, moreProps?:
             return Cast(this.dataField, listSpec(Doc));
         }
         docFilters = () => {
-            return [...this.props.docFilters(), ...Cast(this.props.Document?._docFilters, listSpec("string"), [])];
+            return [...this.props.docFilters(), ...Cast(this.props.Document._docFilters, listSpec("string"), [])];
         }
         docRangeFilters = () => {
             return [...this.props.docRangeFilters(), ...Cast(this.props.Document._docRangeFilters, listSpec("string"), [])];
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index 30d7ed187..2f354c2da 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -287,14 +287,22 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
     @action
     changeScope = (e: any) => {
         if (FilterBox._filterScope === "Current Dashboard" && e.currentTarget.value === "Current Collection") {
-            const temp = CurrentUserUtils.ActiveDashboard._docFilters;
+            const currentDashboardDocFilters = CurrentUserUtils.ActiveDashboard._docFilters;
             CurrentUserUtils.ActiveDashboard._docFilters = new List<string>();
-            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = temp;
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = currentDashboardDocFilters;
+
+            const currentDashboardDocRangeFilters = CurrentUserUtils.ActiveDashboard._docRangeFilters;
+            CurrentUserUtils.ActiveDashboard._docRangeFilters = new List<string>();
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList = currentDashboardDocRangeFilters;
         }
         else if (FilterBox._filterScope === "Current Collection" && e.currentTarget.value === "Current Dashboard") {
-            const temp = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList;
+            const savedDashboardDocFilters = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList;
             (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = undefined;
-            CurrentUserUtils.ActiveDashboard._docFilters = temp;
+            CurrentUserUtils.ActiveDashboard._docFilters = savedDashboardDocFilters;
+
+            const savedDashboardDocRangeFilters = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList;
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList = undefined;
+            CurrentUserUtils.ActiveDashboard._docRangeFilters = savedDashboardDocRangeFilters;
         }
         FilterBox._filterScope = e.currentTarget.value;
     }
-- 
cgit v1.2.3-70-g09d2