Merge pull request #899 from culturecreates/feature/issue-828

fix :fixed sidebar navigation issue for calendar switching
culturecreates · Jan 15, 2024 · 6aeebe3 · 6aeebe3
2 parents ed0ac7d + 656b5d4
commit 6aeebe3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/components/NavigationBar/Dashboard/DashboardNavigationBar.jsx b/src/components/NavigationBar/Dashboard/DashboardNavigationBar.jsx
@@ -5,7 +5,7 @@ import { MenuOutlined } from '@ant-design/icons';
 import ResponsiveSidebar from '../../Sidebar/Responsive';
 
 function NavigationBar(props) {
-  const { currentCalendarData, allCalendarsData } = props;
+  const { currentCalendarData, allCalendarsData, pageNumber, setPageNumber } = props;
 
   const [open, setOpen] = useState(false);
 
@@ -31,6 +31,8 @@ function NavigationBar(props) {
       <ResponsiveSidebar
         allCalendarsData={allCalendarsData}
         currentCalendarData={currentCalendarData}
+        pageNumber={pageNumber}
+        setPageNumber={setPageNumber}
         onClose={onClose}
         open={open}
       />

diff --git a/src/components/Sidebar/Responsive/ResponsiveSidebar.jsx b/src/components/Sidebar/Responsive/ResponsiveSidebar.jsx
@@ -15,7 +15,7 @@ import { contentLanguageBilingual } from '../../../utils/bilingual';
 import i18n from 'i18next';
 
 function ResponsiveSidebar(props) {
-  const { allCalendarsData, currentCalendarData, onClose, open } = props;
+  const { allCalendarsData, currentCalendarData, onClose, open, pageNumber, setPageNumber } = props;
   const { t } = useTranslation();
   let { calendarId } = useParams();
   const navigate = useNavigate();
@@ -63,11 +63,13 @@ function ResponsiveSidebar(props) {
   };
 
   const onSidebarClickHandler = ({ item }) => {
+    onClose();
     navigate(`${PathName.Dashboard}/${calendarId}${item.props.path}`);
   };
   const logoutHandler = ({ key }) => {
     switch (key) {
       case 'userProfile':
+        onClose();
         navigate(`${PathName.Dashboard}/${calendarId}${PathName.Profile}/${user?.id}`);
         break;
       case 'help':
@@ -95,7 +97,7 @@ function ResponsiveSidebar(props) {
       className="sidebar-navigation-menu-responsive-drawer"
       title={
         <div className="sidebar-calendar-menu-responsive">
-          <CalendarList allCalendarsData={allCalendarsData}>
+          <CalendarList pageNumber={pageNumber} setPageNumber={setPageNumber} allCalendarsData={allCalendarsData}>
             <Menu
               defaultSelectedKeys={['1']}
               style={{
@@ -135,7 +137,7 @@ function ResponsiveSidebar(props) {
             itemLayout="horizontal"
             dataSource={items}
             renderItem={(item) => (
-              <List.Item onClick={() => logoutHandler(item)}>
+              <List.Item className="sidebar-footer-item" onClick={() => logoutHandler(item)}>
                 <List.Item.Meta avatar={item.icon} title={<span>{item.label}</span>} />
               </List.Item>
             )}

diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
@@ -122,7 +122,12 @@ function Dashboard() {
     <ErrorLayout>
       <Layout className="dashboard-wrapper">
         <Header className="dashboard-header">
-          <NavigationBar currentCalendarData={currentCalendarData} allCalendarsData={allCalendarsData} />
+          <NavigationBar
+            currentCalendarData={currentCalendarData}
+            allCalendarsData={allCalendarsData}
+            pageNumber={pageNumber}
+            setPageNumber={setPageNumber}
+          />
         </Header>
         <Layout>
           <Sidebar