Merge branch '64_multiple_archive_query' into 'master'

64 multiple archive query

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

src/components/query/QueryMultipleArchives.js

@@ -22,18 +22,39 @@ import LoadingSpinner from "../LoadingSpinner";
 
 export default function QueryMultipleArchives() {
 
-    const { api_host, datasets, getDataset } = useContext(GlobalContext);
+    const { api_host } = useContext(GlobalContext);
     const { config, setConfigName, defaultConf, formData, setFormData } = useContext(QueryContext);
     const {
-        queryStep, setQueryStep,
         selectedDatasets, setSelectedDatasets,
         availableDatasets, setAvailableDatasets,
-        selectedQueries, setSelectedQueries,
         queryResults, setQueryResults,
         status, setStatus } = useContext(MAQContext);
 
     const maqContext = useContext(MAQContext);
 
+    // set confiugration for multi_archive query, execute once
+    useEffect(() => {
+        setConfigName("multiple_archives");
+        return () => {
+            console.log("cleaned up");
+            setFormData();
+            setConfigName(defaultConf);
+        };
+    }, []);
+
+
+    // execute when the status changes
+    useEffect(() => {
+
+        if (status === PREPARE_QUERIES) {
+            prepareQueries(config)
+        }
+
+        if (status === RUN_SELECTED_QUERIES) {
+            fetchRunQueries()
+        }
+
+    }, [status]);
 
     // read from the config object which datasets should be queried
     function prepareQueries(config) {
@@ -44,9 +65,8 @@ export default function QueryMultipleArchives() {
         if (config.datasets_enabled) {
 
             // convert the list of uri's to a list of available datasets which have all their properties
-            // nv: 16nov2021, although this works and shows pretty names, it is noticably slow
-            //     when users click checkboxes.
-            //available_datasets.forEach((available_dataset) => {
+            // nv: 16nov2021, although this works and shows pretty names, it is noticably slow when users click checkboxes.
+            // available_datasets.forEach((available_dataset) => {
             //    let dataset = getDataset(available_dataset)[0]
             //    available.push(dataset)
             //})
@@ -106,37 +126,12 @@ export default function QueryMultipleArchives() {
         })
     }
 
-    // set ConfigName for multi_archive query, execute once
-    useEffect(() => {
-        setConfigName("multiple_archives");
-      return () => {
-        console.log("cleaned up");
-        //queryMap.clear();
-        setFormData();
-        setConfigName(defaultConf);
-      };
-    }, []);
-
-
-    // execute when the form parameters or the queryStep changes
-    useEffect(() => {
-
-        if (status === PREPARE_QUERIES) {
-            prepareQueries(config)
-        }
-
-        if (status === RUN_SELECTED_QUERIES) {
-            fetchRunQueries()
-        }
-
-    }, [queryStep, formData]);
 
     // executed when the 'Run Queries' button is clicked
     function handleRunQueriesButton(formData) {
         setFormData(formData)
         setStatus(RUN_SELECTED_QUERIES)
         console.log('handleRunQueries: status = '+status)
-        setQueryStep('run-query')
     }
 
     // texecuted when the 'Run Queries' button is clicked
@@ -173,6 +168,7 @@ export default function QueryMultipleArchives() {
 
     // This is the 'conditional rendering' logic to construct the GUI based on the current status
 
+    // todo: implement later, perhaps in a different way
     let renderResolveNameButton
     if (formData) {
         renderResolveNameButton = <Button onClick={() => {
@@ -194,6 +190,7 @@ export default function QueryMultipleArchives() {
 
     return (
         <Container fluid>
+
             <AvailableDatasets results={availableDatasets}/>
             <Form
               schema={config.query_schema}
@@ -207,6 +204,7 @@ export default function QueryMultipleArchives() {
             </Form>
 
             {renderQueryResults}
+
         </Container>
     );
 

src/components/services/query_results/AvailableDatasets.js

@@ -14,18 +14,20 @@ export default function AvailableDatasets(props) {
         <Container fluid>
             <Card>
                 <Table>
-                    <thead>
-                    <th>Select Datasets to query</th>
-                    </thead>
+
                     <tbody>
                     <tr>
                     {props.results.map((result, index) => (
+
                         <td key={result.dataset}>
-                            <td>
-                                <SelectDatasetCheckBox id={result.dataset} item={result} />
+                            <Card>
+
+                            <td><SelectDatasetCheckBox id={result.dataset} item={result} />
+                                {result.dataset} ({result.archive})
                             </td>
-                            <td>{result.dataset} ({result.archive})</td>
+                            </Card>
                         </td>
+
                     ))}
                     </tr>
                     </tbody>

src/contexts/GlobalContext.js

@@ -68,12 +68,12 @@ export function GlobalContextProvider({ children }) {
         }, [api_host]);
 
     useEffect(() => {
-    axios
-    .get(api_host + "query/configuration?name=navbar")
-      .then((response) => {
-        console.log("navbar response", response.data.configuration);
-        setNavbar(response.data.configuration);
-      });
+        axios
+        .get(api_host + "query/configuration?name=navbar")
+          .then((response) => {
+            console.log("navbar response", response.data.configuration);
+            setNavbar(response.data.configuration);
+          });
     }, [api_host]);
 
     // Zheng: "!!!!! Still need to look at sessionid and stuff"

src/contexts/MAQContext.js

@@ -21,18 +21,9 @@ export function MAQContextProvider({ children }) {
     const [datasets, setDatasets] = useState([]);
     const [selectedDatasets, setSelectedDatasets] = useState([]);
     const [availableDatasets, setAvailableDatasets] = useState([]);
-    const [queryStep, setQueryStep] = useState("create-queries");
-    const [archiveQueries, setArchiveQueries] = useState([]);
-    const [selectedQueries, setSelectedQueries] = useState([]);
     const [queryResults, setQueryResults] = useState([]);
     const [status, setStatus] = useState(PREPARE_QUERIES);
 
-    /*
-    Multiple Archives Query steps:
-    1. create-query
-    2. run-query
-    */
-
     function handleAddDataset(access_url) {
         setSelectedDatasets([...selectedDatasets, access_url]);
     }
@@ -44,19 +35,6 @@ export function MAQContextProvider({ children }) {
         setSelectedDatasets(copy);
     }
 
-    function handleSelectQuery(query) {
-        setSelectedQueries([...selectedQueries, query]);
-        setStatus(QUERIES_SELECTED)
-        console.log(status)
-    }
-
-    function handleUnselectQuery(query) {
-        const copy = [...selectedQueries];
-        const index = copy.findIndex((q) => q === query);
-        copy.splice(index, 1);
-        setSelectedQueries(copy);
-    }
-
   return (
     <MAQContext.Provider
       value={{
@@ -69,16 +47,8 @@ export function MAQContextProvider({ children }) {
         selectDataset: handleAddDataset,
         unselectDataset: handleRemoveDataset,
 
-        queryStep,
-        setQueryStep,
         status,
         setStatus,
-
-        selectedQueries,
-        setSelectedQueries,
-        selectQuery: handleSelectQuery,
-        unselectQuery: handleUnselectQuery,
-
         queryResults,
         setQueryResults,
       }}

src/routes/Routes.js

@@ -100,7 +100,7 @@ export default function Routes() {
 
         </Switch>
 
-      <footer><small>esap-gui version 16 nov 2021 - 8:00</small></footer>
+      <footer><small>esap-gui version 16 nov 2021 - 12:00</small></footer>
     </Router>
   );
 }