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

bugfix: implemented window reload upon calendar change
culturecreates · Nov 20, 2023 · f00624d · f00624d
2 parents facb5f4 + 2bfdf73
commit f00624d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/src/components/Dropdown/Calendar/Calendar.jsx b/src/components/Dropdown/Calendar/Calendar.jsx
@@ -3,7 +3,6 @@ import './calendar.css';
 import { Dropdown } from 'antd';
 import { useDispatch } from 'react-redux';
 import { setSelectedCalendar } from '../../../redux/reducer/selectedCalendarSlice';
-import { useNavigate } from 'react-router-dom';
 import { PathName } from '../../../constants/pathName';
 import { contentLanguageBilingual } from '../../../utils/bilingual';
 import { useSelector } from 'react-redux';
@@ -12,8 +11,8 @@ import Cookies from 'js-cookie';
 
 function Calendar({ children, allCalendarsData, setPageNumber }) {
   const dispatch = useDispatch();
-  const navigate = useNavigate();
   const { user } = useSelector(getUserDetails);
+  const calendarIdInCookies = Cookies.get('calendarId');
 
   const [open, setOpen] = useState(false);
   const items = allCalendarsData?.data?.map((item) => {
@@ -45,19 +44,25 @@ function Calendar({ children, allCalendarsData, setPageNumber }) {
     };
   });
   const onClick = ({ key }) => {
-    navigate(`${PathName.Dashboard}/${key}${PathName.Events}`);
-    dispatch(setSelectedCalendar(String(key)));
-    Cookies.set('calendarId', key);
-    setPageNumber(1);
-    sessionStorage.removeItem('page');
-    sessionStorage.removeItem('query');
-    sessionStorage.removeItem('order');
-    sessionStorage.removeItem('sortBy');
-    sessionStorage.removeItem('users');
-    sessionStorage.removeItem('publication');
-    sessionStorage.removeItem('startDateRange');
-    sessionStorage.removeItem('endDateRange');
-    setOpen(false);
+    if (calendarIdInCookies != key) {
+      dispatch(setSelectedCalendar(String(key)));
+      Cookies.set('calendarId', key);
+      setPageNumber(1);
+      sessionStorage.removeItem('page');
+      sessionStorage.removeItem('query');
+      sessionStorage.removeItem('order');
+      sessionStorage.removeItem('sortBy');
+      sessionStorage.removeItem('users');
+      sessionStorage.removeItem('publication');
+      sessionStorage.removeItem('startDateRange');
+      sessionStorage.removeItem('endDateRange');
+      sessionStorage.removeItem('organizers');
+      setOpen(false);
+      console.log(window.location.origin);
+      const origin = window.location.origin;
+      const newUrl = `${origin}${PathName.Dashboard}/${key}${PathName.Events}`;
+      window.location.href = newUrl;
+    }
   };
 
   const handleOpenChange = (flag) => {

diff --git a/src/pages/Dashboard/Events/Events.jsx b/src/pages/Dashboard/Events/Events.jsx
@@ -253,7 +253,7 @@ function Events() {
     sessionStorage.setItem('sortBy', filter?.sort);
     if (usersQuery) sessionStorage.setItem('users', usersQuery);
     else sessionStorage.removeItem('users');
-    if (usersQuery) sessionStorage.setItem('organizers', usersQuery);
+    if (organizerQuery) sessionStorage.setItem('organizers', organizerQuery);
     else sessionStorage.removeItem('organizers');
     if (publicationQuery) sessionStorage.setItem('publication', publicationQuery);
     else if (sessionStorage.getItem('publication')) {