Merge branch 'dev-nico' into 'master'

Dev nico

See merge request astron-sdc/esap-gui!51

src/components/query/QueryIVOARegistry.js

@@ -94,9 +94,11 @@ export default function QueryIVOARegistry() {
           if(queryStep === "run-query") {
           let tf_url = api_host + "query/get-tables-fields/?dataset_uri=vo_reg&access_url=" + query.catalog;
           console.log("table fields url: ", tf_url);
+
           axios
             .get(tf_url)
             .then((tfResponse) => {
+
               queryMap.set(query.catalog, {
                 catalog: query.catalog,
                 service_type: query.service_type,

src/routes/Routes.js

@@ -52,17 +52,17 @@ export default function Routes() {
             <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} />
 
-            <Route exact path={["/query", "/archives/:uri/query"]}>
-                <QueryCatalogs />
-            </Route>
             <Route exact path="/archives/ivoa/query">
                 <IVOAContextProvider>
                     <QueryIVOARegistry />
                 </IVOAContextProvider>
             </Route>
-            <Route exact path={["/adex-query", "/archives/:uri/query"]}>
+
+            <Route exact path={["/query", "/archives/:uri/query"]}>
                 <QueryCatalogs />
             </Route>
 
@@ -87,7 +87,7 @@ export default function Routes() {
 
         </Switch>
 
-      <footer><small>esap-gui version 20 aug 2021 - 10:00</small></footer>
+      <footer><small>esap-gui version 20 aug 2021 - 14:00</small></footer>
     </Router>
   );
 }