add level,collection to results and to query

src/components/query/QueryMultipleArchives.js

@@ -104,11 +104,13 @@ export default function QueryMultipleArchives() {
             }
 
             // add archive and collection parameters
-            let url = api_host + "query/query?&collection=" + query.result.collection
+            let url = api_host + "query/query?" + "" +
+                "&collection=" + query.result.collection +
+                "&level=" + query.result.level +
+                "&category=" + query.result.category
 
             // add the ESAP common parameters from the GUI
             url = url + '&' + query.result.esap_query
-
             setStatus(FETCHING_SELECTED_QUERIES)
             console.log('status = '+status)
 

src/components/services/query_results/CreateMultiQueryResults.js

@@ -19,8 +19,10 @@ export default function CreateMultiQueryResults(props) {
                     <th>Select</th>
                     <th>Archive</th>
                     <th>Dataset</th>
+                    <th>Collection</th>
+                    <th>Category</th>
+                    <th>Level</th>
                     <th>ESAP Query</th>
-                    <th>Archive Query</th>
                 </tr>
                 </thead>
 
@@ -32,8 +34,10 @@ export default function CreateMultiQueryResults(props) {
                         </td>
                         <td>{result.archive}</td>
                         <td>{result.dataset}</td>
+                        <td>{result.collection}</td>
+                        <td>{result.category}</td>
+                        <td>{result.level}</td>
                         <td>{result.esap_query}</td>
-                        <td><a href={result.query} target="_blank">{result.query}</a></td>
                     </tr>
                 ))}
                 </tbody>

src/components/services/query_results/RunMultiQueryResults.js

@@ -18,13 +18,14 @@ export default function RunQueryResults(props) {
 
         <Container fluid>
             <Card>
+                <h3>Query Results</h3>
             <Table>
                 <thead>
-                <tr><td collspan="4">Query Results</td></tr>
                 <tr className="bg-light">
-                    <th>Select</th>
+                    <th>Basket</th>
                     <th>Name</th>
                     <th>Collection</th>
+                    <th>Level</th>
                     <th>RA</th>
                     <th>dec</th>
                     <th>Link to data</th>
@@ -40,6 +41,7 @@ export default function RunQueryResults(props) {
                         </td>
                         <td>{result.name}</td>
                         <td>{result.collection}</td>
+                        <td>{result.level}</td>
                         <td>{result.ra}</td>
                         <td>{result.dec}</td>
                         <td>
@@ -49,7 +51,7 @@ export default function RunQueryResults(props) {
                                 rel="noopener noreferrer"
                                 download
                             >
-                                {result.url}
+                                Download Data
                             </a>
                         </td>
                     </tr>

src/routes/Routes.js

@@ -103,7 +103,7 @@ export default function Routes() {
 
         </Switch>
 
-      <footer><small>esap-gui version 2 nov 2021 - 15:00</small></footer>
+      <footer><small>esap-gui version 4 nov 2021 - 15:00</small></footer>
     </Router>
   );
 }