diff --git a/openbis_ng_ui/src/js/common/url.js b/openbis_ng_ui/src/js/common/url.js deleted file mode 100644 index eead0cf228fb852b0967bfab161ad15461202f3f..0000000000000000000000000000000000000000 --- a/openbis_ng_ui/src/js/common/url.js +++ /dev/null @@ -1,10 +0,0 @@ -function getApplicationPath() { - return window.location.pathname.substr( - 0, - window.location.pathname.lastIndexOf('/') + 1 - ) -} - -export default { - getApplicationPath -} diff --git a/openbis_ng_ui/src/js/components/AppController.js b/openbis_ng_ui/src/js/components/AppController.js index 26b06fbd9b4b44b325770904358c0c663f94628c..7ccc32370457f3b345097cfe2e29ada7aeb75b0f 100644 --- a/openbis_ng_ui/src/js/components/AppController.js +++ b/openbis_ng_ui/src/js/components/AppController.js @@ -1,13 +1,12 @@ import _ from 'lodash' import React from 'react' -import { createBrowserHistory } from 'history' +import { createHashHistory } from 'history' import openbis from '@src/js/services/openbis.js' import objectType from '@src/js/common/consts/objectType.js' import objectOperation from '@src/js/common/consts/objectOperation.js' import routes from '@src/js/common/consts/routes.js' import users from '@src/js/common/consts/users.js' import cookie from '@src/js/common/cookie.js' -import url from '@src/js/common/url.js' import ids from '@src/js/common/consts/ids.js' const AppContext = React.createContext() @@ -16,12 +15,10 @@ export class AppController { init(context) { context.initState(this.initialState()) - const history = createBrowserHistory({ - basename: url.getApplicationPath() + '#' - }) + const history = createHashHistory() history.listen(location => { - const route = routes.parse(location.pathname) + const route = routes.parse(location.location.pathname) this.routeChanged(route.path) })