Skip to content
Snippets Groups Projects
Commit e66bf29b authored by Klaas Kliffen's avatar Klaas Kliffen :satellite:
Browse files

Remove JHub URL and clean up imports 

The JHub URL is not even exported from the Context!
parent 7278c769
No related branches found
No related tags found
1 merge request!102Remove Skip button from Workflow selection
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 99 deletions
src/routes/Routes.js
+ 88
− 99
View file @ e66bf29b
import React, { useContext } from "react";
import { Switch, Route, Redirect } from "react-router-dom";
import { Route, Switch } from "react-router-dom";
import { Archives } from "../components/archives/Archives";
import ArchiveDetails from "../components/archives/ArchiveDetails";
import { GlobalContext } from "../contexts/GlobalContext";
import { Archives } from "../components/archives/Archives";
import QueryCatalogs from "../components/query/QueryCatalogs";
import QueryIVOARegistry from "../components/query/QueryIVOARegistry";
import QueryMultipleArchives from "../components/query/QueryMultipleArchives";
//import QueryMultipleArchives from "../components/query/QueryNico";
import { GlobalContext } from "../contexts/GlobalContext";
import { BrowserRouter as Router } from "react-router-dom";
import MyBasketPage from "../components/basket/MyBasketPage";
import NavBar from "../components/NavBar";
import Rucio from "../components/services/Rucio";
import Interactive from "../components/services/Interactive";
import Batch from "../components/services/Batch";
import Interactive from "../components/services/Interactive";
import Rucio from "../components/services/Rucio";
import SubmitJob from "../components/services/SubmitJob";
import MyBasketPage from "../components/basket/MyBasketPage";
import { IVOAContextProvider } from "../contexts/IVOAContext";
import { IDAContext } from "../contexts/IDAContext";
import { BATCHContext } from "../contexts/BATCHContext";
import { AladinSimpleContextProvider } from "../contexts/AladinSimpleContext";
import { AladinAdvancedContextProvider } from "../contexts/AladinAdvancedContext";
import { AladinSimpleContextProvider } from "../contexts/AladinSimpleContext";
import { IVOAContextProvider } from "../contexts/IVOAContext";
import SampPage from '../components/services/samp/SampPage';
import AladinSimplePage from '../components/services/aladin/AladinSimplePage';
import AladinAdvancedPage from '../components/services/aladin/AladinAdvancedPage';
import AladinSimplePage from '../components/services/aladin/AladinSimplePage';
import SampPage from '../components/services/samp/SampPage';
import { createBrowserHistory } from "history";
import Jobs from "../components/services/Jobs";
import {createBrowserHistory} from "history"
import { COMMIT_DATE, COMMIT_URL } from "../utils/version";
export default function Routes() {
const history = createBrowserHistory();
const { navbar, handleLogin, handleLogout, handleError } = useContext(GlobalContext);
const { jhubURL } = useContext(IDAContext);
if (!navbar) return null;
// nv: if no jhubURL can be loaded then whole website should be blank? Isn't that overkill? commented it out for now
// if (!jhubURL) return null;
return (
<Router basename={navbar.frontend_basename} history={history}>
<NavBar />
<Switch>
<Route exact path={["/", "/archives"]}>
<Archives />
</Route>
<Route exact path="/rucio">
<Rucio />
</Route>
<Route exact path="/interactive">
<Interactive />
</Route>
<Route exect path="/jobs">
<Jobs />
</Route>
<Route exact path="/batch">
<Batch />
</Route>
<Route exact path="/batch/SubmitJob">
<SubmitJob />
</Route>
/*
<Route exact path="/vo-query">
<Redirect to="/archives/ivoa/query" />
</Route>
*/
<Route exact path="/jhub" render={() => (window.location = {jhubURL})} />
<Route exact path="/login" component={handleLogin} />
<Route exact path="/logout" component={handleLogout} />
<Route exact path="/error" component={handleError} />
<Route exact path="/archives/:uri" component={ArchiveDetails} />
/* specific behaviour for IVOA 'archive' to enable a 2-stage query */
<Route exact path="/archives/ivoa/query">
<IVOAContextProvider>
<QueryIVOARegistry />
</IVOAContextProvider>
</Route>
/* default 1-stage synchronous query behaviour for most archives */
<Route exact path={["/archives/:uri/query"]}>
<QueryCatalogs />
</Route>
/* query multiple archives */
<Route exact path="/query">
<QueryMultipleArchives />
</Route>
<Route exact path="/samp" >
<SampPage/>
</Route>
<Route exact path="/aladin_simple" >
<AladinSimpleContextProvider>
<AladinSimplePage/>
</AladinSimpleContextProvider>
</Route>
<Route exact path="/aladin_advanced" >
<AladinAdvancedContextProvider>
<AladinAdvancedPage/>
</AladinAdvancedContextProvider>
</Route>
<Route exact path="/basket" >
<MyBasketPage/>
</Route>
</Switch>
<footer><small><a href={COMMIT_URL}>ESAP-GUI version {COMMIT_DATE}</a></small></footer>
</Router>
);
return (
<Router basename={navbar.frontend_basename} history={history}>
<NavBar />
<Switch>
<Route exact path={["/", "/archives"]}>
<Archives />
</Route>
<Route exact path="/rucio">
<Rucio />
</Route>
<Route exact path="/interactive">
<Interactive />
</Route>
<Route exect path="/jobs">
<Jobs />
</Route>
<Route exact path="/batch">
<Batch />
</Route>
<Route exact path="/batch/SubmitJob">
<SubmitJob />
</Route>
<Route exact path="/login" component={handleLogin} />
<Route exact path="/logout" component={handleLogout} />
<Route exact path="/error" component={handleError} />
<Route exact path="/archives/:uri" component={ArchiveDetails} />
{/* specific behaviour for IVOA 'archive' to enable a 2-stage query */}
<Route exact path="/archives/ivoa/query">
<IVOAContextProvider>
<QueryIVOARegistry />
</IVOAContextProvider>
</Route>
{/* default 1-stage synchronous query behaviour for most archives */}
<Route exact path={["/archives/:uri/query"]}>
<QueryCatalogs />
</Route>
{/* query multiple archives */}
<Route exact path="/query">
<QueryMultipleArchives />
</Route>
<Route exact path="/samp" >
<SampPage />
</Route>
<Route exact path="/aladin_simple" >
<AladinSimpleContextProvider>
<AladinSimplePage />
</AladinSimpleContextProvider>
</Route>
<Route exact path="/aladin_advanced" >
<AladinAdvancedContextProvider>
<AladinAdvancedPage />
</AladinAdvancedContextProvider>
</Route>
<Route exact path="/basket" >
<MyBasketPage />
</Route>
</Switch>
<footer><small><a href={COMMIT_URL}>ESAP-GUI version {COMMIT_DATE}</a></small></footer>
</Router>
);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment