Merge pull request #782 from culturecreates/bugfix/issue-752

fix: filters not clearing issue while switching calendars
culturecreates · Nov 15, 2023 · 5f0635c · 5f0635c
2 parents ddef590 + ffb55e8
commit 5f0635c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/components/Sidebar/Main/Sidebar.jsx b/src/components/Sidebar/Main/Sidebar.jsx
@@ -72,6 +72,7 @@ function Sidebar(props) {
       interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
       calendarContentLanguage: calendarContentLanguage,
     });
+    sessionStorage.clear();
     setCalendarItem(selectedCalendar(currentCalendarData?.id, currentCalendarData?.image?.uri, calendarLabel));
   }, [currentCalendarData]);
 

diff --git a/src/pages/Dashboard/Events/Events.jsx b/src/pages/Dashboard/Events/Events.jsx
@@ -144,6 +144,10 @@ function Events() {
 
   const calendarContentLanguage = currentCalendarData?.contentLanguage;
 
+  useEffect(() => {
+    filterClearHandler(); // when calendar data changes filters are reset
+  }, [currentCalendarData]);
+
   useEffect(() => {
     let query = new URLSearchParams();
     let sortQuery = new URLSearchParams();