Revert react-router upgrade

- keep using version 3 while we do not have a way for routing to work in web UI plugins
bioinformatics-ua · Nov 11, 2024 · dda4b99 · dda4b99
1 parent 3f53c4a
commit dda4b99
Show file tree

Hide file tree

Showing 6 changed files with 2,047 additions and 2,520 deletions.
diff --git a/dicoogle/src/main/resources/webapp/js/app.js b/dicoogle/src/main/resources/webapp/js/app.js
@@ -96,7 +96,7 @@ class App extends React.Component {
     }
 
     if (location.hash === "" || location.hash === "/") {
-      this.context.router.history.push("/login");
+      this.props.router.push("/login");
     }
   }
 
@@ -107,7 +107,7 @@ class App extends React.Component {
       this.setState(data);
     }
 
-    let history = this.context.router.history;
+    let history = this.props.router;
     if (!data.isLoggedIn) {
       if (!process.env.GUEST_USERNAME) {
         history.replace("/login");

diff --git a/dicoogle/src/main/resources/webapp/js/components/plugin/pluginView.jsx b/dicoogle/src/main/resources/webapp/js/components/plugin/pluginView.jsx
@@ -56,11 +56,12 @@ export default class PluginView extends React.Component {
   }
 
   getPluginName() {
-    return this.props.plugin || (this.props.match?.params?.plugin);
+    return this.props.plugin || (this.props.params?.plugin);
   }
 
   render() {
     const plugin = this.getPluginName();
+    console.debug("Trying to render plugin", plugin);
     return (
       <div className={this.props.className} style={this.props.style}>
         {this.state.elements[plugin] ? (

diff --git a/dicoogle/src/main/resources/webapp/js/components/sidebar.js b/dicoogle/src/main/resources/webapp/js/components/sidebar.js
@@ -6,7 +6,7 @@
 import React from "react";
 import createReactClass from "create-react-class";
 import * as PropTypes from "prop-types";
-import { NavLink } from "react-router-dom";
+import { Link } from "react-router";
 import UserStore from "../stores/userStore";
 
 const Sidebar = createReactClass({
@@ -49,9 +49,9 @@ const Sidebar = createReactClass({
             if (!e.admin || isAdmin)
               return (
                 <li key={e.value}>
-                  <NavLink activeClassName="active" to={to}>
+                  <Link activeClassName="active" to={to}>
                     <i className={e.icon} /> &nbsp; {e.caption}
-                  </NavLink>
+                  </Link>
                 </li>
               );
           })}

diff --git a/dicoogle/src/main/resources/webapp/js/external-requires.js b/dicoogle/src/main/resources/webapp/js/external-requires.js
@@ -5,7 +5,7 @@
  */
 const EXTERNAL_MODULES = {
   react: require("react"),
-  "react-router-dom": require("react-router-dom"),
+  "react-router": require("react-router"),
   reflux: require("reflux"),
   "dicoogle-webcore": require("dicoogle-webcore"),
   "dicoogle-client": require("dicoogle-client"),