[feature] use internal router tool to handle routing to the statistic…

…s page
kbss-cvut · May 16, 2024 · 9a090ca · 9a090ca
1 parent 94098ac
commit 9a090ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/components/MainView.jsx b/src/components/MainView.jsx
@@ -20,6 +20,7 @@ import { isAdmin } from "../utils/SecurityUtils";
 import Messages from "./message/Messages";
 import Footer from "../Footer";
 import PropTypes from "prop-types";
+import { ANALYTICS_URL } from "../../config/index.js";
 
 class MainView extends React.Component {
   constructor(props) {
@@ -61,6 +62,14 @@ class MainView extends React.Component {
     }
   }
 
+  showStatistics = () => {
+    if (ANALYTICS_URL === "") {
+      transitionTo(routes.statistics);
+    } else {
+      window.location.href = ANALYTICS_URL;
+    }
+  };
+
   render() {
     if (this.props.status === ACTION_STATUS.PENDING) {
       return <LoaderMask />;
@@ -120,14 +129,10 @@ class MainView extends React.Component {
                     </NavItem>
                   </IfGranted>
                   <IfGranted expected={ROLE.ADMIN} actual={user.role}>
-                    <NavItem>
-                      <NavLink
-                        className="nav-link"
-                        isActive={() => path.startsWith(Routes.statistics.path)}
-                        to={Routes.statistics.path}
-                      >
+                    <NavItem style={{ cursor: "pointer" }}>
+                      <div className="nav-link" onClick={() => this.showStatistics()}>
                         {this.i18n("statistics.panel-title")}
-                      </NavLink>
+                      </div>
                     </NavItem>
                   </IfGranted>
                   <IfGranted expected={ROLE.ADMIN} actual={user.role}>

diff --git a/src/utils/Routes.jsx b/src/utils/Routes.jsx
@@ -10,7 +10,6 @@ import requireAuth from "../components/misc/hoc/RequireAuth";
 import UsersController from "../components/user/UsersController";
 import UserController from "../components/user/UserController";
 import PasswordChangeController from "../components/user/PasswordChangeController";
-import Statistics from "../components/statistics/Statistics";
 import InstitutionsController from "../components/institution/InstitutionsController";
 import InstitutionController from "../components/institution/InstitutionController";
 import RecordsController from "../components/record/RecordsController";
@@ -35,7 +34,6 @@ export const authRoutes = (
     <Route exact path={Routes.createUser.path} component={requireAuth(UserController)} />
     <Route exact path={Routes.editUser.path} component={requireAuth(UserController)} />
     <Route exact path={Routes.passwordChange.path} component={requireAuth(PasswordChangeController)} />
-    <Route exact path={Routes.statistics.path} component={requireAuth(Statistics)} />
     <Route exact path={Routes.institutions.path} component={requireAuth(InstitutionsController)} />
     <Route exact path={Routes.createInstitution.path} component={requireAuth(InstitutionController)} />
     <Route exact path={Routes.editInstitution.path} component={requireAuth(InstitutionController)} />