Merge branch 'esap-gui-dev' into 'master'

Merge branch 'esap-gui-dev' into 'master'

src/components/buttons/RunQueriesButton.js

@@ -8,7 +8,7 @@ import { GetBackendHost } from '../../utils/web'
 import { useGlobalReducer } from '../../Store';
 import { useFetchRunQuery } from '../../hooks/useFetchRunQuery';
 
-import { SET_DATASETS_TO_QUERY, SET_QUERIES_HAVE_RESULTS } from '../../reducers/GlobalStateReducer';
+import { SET_QUERIES_TO_RUN, SET_QUERIES_HAVE_RESULTS } from '../../reducers/GlobalStateReducer';
 
 // show a clickable icon
 export default function RunQueriesButton(props) {
@@ -25,31 +25,45 @@ export default function RunQueriesButton(props) {
     const runQuery = (input_query) => {
 
         let query = input_query.query
+        let access_url = query.split('?')[0]
 
         // if this is a VO query, then cut off everything but the ADQL itself so that the backend can parse it.
         if (input_query.esap_service.toUpperCase()==='VO') {
             //let query = input_query.query
             let s = query.split('&QUERY=')
             query = s[1]
+        } else
+
+        if (input_query.esap_service.toUpperCase()==='VO_REG') {
+            //let query = input_query.query
+            let s = query.split('&QUERY=')
+            query = s[1]
         }
 
-        let url = getBackendUrl("run-query") + "?dataset_uri=" + input_query.dataset + "&query=" + query
+        let url = getBackendUrl("run-query")
+            + "?dataset_uri=" + input_query.dataset
+            + "&dataset_name=" + input_query.dataset_name
+            + "&access_url=" + access_url
+            + "&query=" + query
+
 
         // encode it
-        fetchRunQuery.fetchData(encodeURI(url), input_query.dataset)
+        // fetchRunQuery.fetchData(encodeURI(url), input_query.dataset)
+        fetchRunQuery.fetchData(encodeURI(url), input_query.dataset_name)
+
     }
 
 
     // run all the queries in the selected list of queries
     const runQueries = (queries) => {
-        let datasets_to_query = []
+        let queries_to_run = []
         for (var i=0; i< queries.length; i++) {
-            //datasets_to_query.push(queries[i].dataset) // uri only
-            datasets_to_query.push(queries[i])
+            //alert(queries[i].dataset_name)
+            queries_to_run.push(queries[i])
         }
 
         // store the list of datasets to query. This can later be used as keys to iterate over the results
-        my_dispatch({type: SET_DATASETS_TO_QUERY, datasets_to_query: datasets_to_query})
+        my_dispatch({type: SET_QUERIES_TO_RUN, queries_to_run: queries_to_run})
         my_dispatch({type: SET_QUERIES_HAVE_RESULTS, queries_have_results: true})
 
         // run the queries by firing a asyc request per query